diff --git a/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts b/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts index 12c48ffc..4a5f7590 100644 --- a/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts +++ b/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts @@ -1,11 +1,11 @@ -import {ApplicationContext} from 'cad/context'; -import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; -import {EntityKind} from "cad/model/entities"; -import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; -import {OperationDescriptor} from "cad/craft/operationBundle"; +import { ApplicationContext } from 'cad/context'; +import { roundValueForPresentation as r } from 'cad/craft/operationHelper'; +import { EntityKind } from "cad/model/entities"; +import { BooleanDefinition } from "cad/craft/schema/common/BooleanDefinition"; +import { OperationDescriptor } from "cad/craft/operationBundle"; import CSys from "math/csys"; -import {MDatum} from "cad/model/mdatum"; -import {ExpectedOrderProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; +import { MDatum } from "cad/model/mdatum"; +import { ExpectedOrderProductionAnalyzer } from "cad/craft/production/productionAnalyzer"; import icon from "./CUBE.svg"; interface PrimitiveBoxParams { @@ -14,15 +14,16 @@ interface PrimitiveBoxParams { z: number, locations: MDatum, boolean: BooleanDefinition, + featureId:string, } -export const PrimitiveBoxOperation: OperationDescriptor = { +export const PrimitiveBoxOperation: OperationDescriptor = { id: 'BOX', label: 'Box', icon, info: 'Primitive Box', - path:__dirname, - paramsInfo: ({x, y, z}) => `(${r(x)} , ${r(y)} , ${r(z)})`, + path: __dirname, + paramsInfo: ({ x, y, z }) => `(${r(x)} , ${r(y)} , ${r(z)})`, form: [ { type: 'number', @@ -67,6 +68,7 @@ export const PrimitiveBoxOperation: OperationDescriptor = { run: (params: PrimitiveBoxParams, ctx: ApplicationContext) => { + console.log(params , this); const occ = ctx.occService; const oci = occ.commandInterface; @@ -82,37 +84,37 @@ export const PrimitiveBoxOperation: OperationDescriptor = { const box = occ.io.getShell("box", new ExpectedOrderProductionAnalyzer( [ { - id: 'F:LEFT', + id: params.featureId + 'F:LEFT', productionInfo: { role: 'sweep' } }, { - id: 'F:RIGHT', + id: params.featureId + 'F:RIGHT', productionInfo: { role: 'sweep' } }, { - id: 'F:BASE', + id: params.featureId + 'F:BASE', productionInfo: { role: 'base' } }, { - id: 'F:LID', + id: params.featureId + 'F:LID', productionInfo: { role: 'lid' } }, { - id: 'F:BACK', + id: params.featureId + 'F:BACK', productionInfo: { role: 'sweep' } }, { - id: 'F:FRONT', + id: params.featureId + 'F:FRONT', productionInfo: { role: 'sweep' } diff --git a/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts b/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts index 7c5ed16a..c8653e68 100644 --- a/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts +++ b/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts @@ -88,7 +88,7 @@ export const PrimitiveConeOperation: OperationDescriptor = const newFacesIds = [ { - id: 'F:SIDE', + id: params.featureId + 'F:SIDE', productionInfo: { role: 'sweep' } @@ -97,7 +97,7 @@ export const PrimitiveConeOperation: OperationDescriptor = if (params.diameterB > 0) { newFacesIds.push({ - id: 'F:BASE', + id: params.featureId + 'F:BASE', productionInfo: { role: 'base' } @@ -106,7 +106,7 @@ export const PrimitiveConeOperation: OperationDescriptor = if (params.diameterA > 0) { newFacesIds.push({ - id: 'F:LID', + id: params.featureId + 'F:LID', productionInfo: { role: 'lid' } diff --git a/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts b/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts index b4f6b8f9..9af248ba 100644 --- a/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts +++ b/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts @@ -81,19 +81,19 @@ export const PrimitiveCylinderOperation: OperationDescriptor const torus = occ.io.getShell("torus", new ExpectedOrderProductionAnalyzer( [ { - id: 'F:TORUS', + id: params.featureId + 'F:TORUS', productionInfo: { role: 'sweep' }