From ee4c0b8f12584367e50e6cd457f6f5650effc518 Mon Sep 17 00:00:00 2001 From: Mike Molinari Date: Sun, 27 Feb 2022 18:45:24 +0000 Subject: [PATCH] made flange automaticically pick union target shell --- .../features/smFlange/smFlange.operation.ts | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/workbenches/modeler/features/smFlange/smFlange.operation.ts b/modules/workbenches/modeler/features/smFlange/smFlange.operation.ts index 41556d27..26920075 100644 --- a/modules/workbenches/modeler/features/smFlange/smFlange.operation.ts +++ b/modules/workbenches/modeler/features/smFlange/smFlange.operation.ts @@ -2,7 +2,7 @@ import { roundValueForPresentation as r } from 'cad/craft/operationHelper'; import { MFace } from "cad/model/mface"; import { ApplicationContext } from "context"; import { EntityKind } from "cad/model/entities"; -import { BooleanDefinition } from "cad/craft/schema/common/BooleanDefinition"; +import { BooleanDefinition, BooleanKind } from "cad/craft/schema/common/BooleanDefinition"; import Axis from "math/axis"; import { OperationDescriptor } from "cad/craft/operationPlugin"; @@ -10,7 +10,6 @@ interface smFlangeParams { angle: number; face: MFace; axis: Axis, - boolean: BooleanDefinition } export const smFlangeOperation: OperationDescriptor = { @@ -25,6 +24,7 @@ export const smFlangeOperation: OperationDescriptor = { const oci = occ.commandInterface; const face = params.face; + console.log(face); let occFaces = [face]; @@ -36,8 +36,12 @@ export const smFlangeOperation: OperationDescriptor = { return shapeName; }); - - return occ.utils.applyBooleanModifier(tools, params.boolean); + const booleanOpperation = { + kind:"UNION", + targets:[params.face.shell] + } + + return occ.utils.applyBooleanModifier(tools, booleanOpperation); }, form: [ @@ -69,21 +73,12 @@ export const smFlangeOperation: OperationDescriptor = { preselectionIndex: 0 }, }, - - { type: 'axis', name: 'axis', label: 'axis', optional: false }, - { - type: 'boolean', - name: 'boolean', - label: 'boolean', - optional: true, - defaultValue: 'UNION' - } ], }