From 7191d431e6f896d0829997f083a2acbe0a022c83 Mon Sep 17 00:00:00 2001 From: Mike Molinari Date: Sat, 9 Jul 2022 21:55:40 +0000 Subject: [PATCH] Non working hole location from datium --- .../modeler/features/hole/Hole.operation.ts | 25 ++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/modules/workbenches/modeler/features/hole/Hole.operation.ts b/modules/workbenches/modeler/features/hole/Hole.operation.ts index 46547102..a063d327 100644 --- a/modules/workbenches/modeler/features/hole/Hole.operation.ts +++ b/modules/workbenches/modeler/features/hole/Hole.operation.ts @@ -46,23 +46,21 @@ export const HoleOperation: OperationDescriptor = { created: [] }; - let sketch = ctx.sketchStorageService.readSketch(params.sketch.id); - console.log(sketch, "sketch info here"); + //let sketch = ctx.sketchStorageService.readSketch(params.sketch.id); + //console.log(sketch, "sketch info here"); - oci.pcylinder("basehole", params.diameter / 2, params.depth); + oci.pcylinder("result", params.diameter / 2, params.depth); - if (params.holeType == "normal") { - returnObject.created.push(occ.io.getShell("basehole")); - } + // if (params.holeType == "normal") { + // returnObject.created.push(occ.io.getShell("basehole")); + // } if (params.holeType == "counterbore") { oci.pcylinder("counterbore", params.counterBoreDiameter / 2, params.counterBoreDepth); - oci.bop("basehole", "counterbore"); - oci.bopfuse("result"); - - returnObject.created.push(occ.io.getShell("result")); + oci.bop("result", "counterbore"); + oci.bopfuse("result"); } if (params.holeType == "countersink") { @@ -71,14 +69,13 @@ export const HoleOperation: OperationDescriptor = { oci.pcone("countersink", params.countersinkDiameter / 2, 0, heightFromDiameterAndAngle); - oci.bop("basehole", "countersink"); + oci.bop("result", "countersink"); oci.bopfuse("result"); - returnObject.created.push(occ.io.getShell("result")); } - let ptr = Interrogate("base", true).ptr; + let ptr = Interrogate("result", true).ptr; SetLocation(ptr, params.datum.csys.outTransformation.toFlatArray()); - + returnObject.created.push(occ.io.getShell("result")); console.log(returnObject); return returnObject; diff --git a/package.json b/package.json index 4947a0c8..13396356 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "earcut": "2.1.1", "font-awesome": "4.7.0", "immer": "^9.0.12", - "jsketcher-occ-engine": "1.0.1-2144340d03c052dc3c4bfab1c045ee28a6ba1528", + "jsketcher-occ-engine": "1.0.1-0cd4fdc77e9c85bbbe6951d90646bd3361ab6797", "jszip": "^3.10.0", "less": "^3.11.1", "libtess": "1.2.2",