From c7b0cf541bac4f06b97e40c2403dc03c0942d549 Mon Sep 17 00:00:00 2001 From: Mike Molinari Date: Sun, 17 Jul 2022 02:53:23 +0000 Subject: [PATCH] add icons for delete body and import commands --- .../deleteBody/deleteBody.operation.ts | 2 +- .../patternLinear/patternLinear.operation.ts | 26 ++++++------------ web/img/cad/deleteBody32.png | Bin 1095 -> 4661 bytes web/img/cad/deleteBody96.png | Bin 1095 -> 4661 bytes 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts b/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts index 1635e63f..da53a419 100644 --- a/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts +++ b/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts @@ -11,7 +11,7 @@ interface DeleteBodyParams { export const DeleteBodyOperation: OperationDescriptor = { id: 'DELETE_BODY', label: 'DeleteBody', - icon: 'img/cad/intersection', + icon: 'img/cad/deleteBody', info: 'Delete Bodies', paramsInfo: ({ tools, DeleteBody }) => `(${r(tools)} ${r(DeleteBody)})`, run: (params: DeleteBodyParams, ctx: ApplicationContext) => { diff --git a/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts b/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts index 32e19182..d36f8679 100644 --- a/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts +++ b/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts @@ -7,8 +7,6 @@ import { UnitVector } from "math/vector"; import { OperationDescriptor } from "cad/craft/operationPlugin"; import { MShell } from 'cad/model/mshell'; import { MDatum } from "cad/model/mdatum"; -import {Matrix3x4} from "math/matrix"; -import {SetLocation} from "cad/craft/e0/interact"; interface patternLinearParams { inputBodies: MShell[]; @@ -33,23 +31,15 @@ export const PatternLinearOperation: OperationDescriptor = let created = []; + const newDatum = new MDatum({}); + console.log(newDatum); + params.inputBodies.forEach((shellToPatern, index) => { - for (let i = 2; i <= params.qty; i++) { - let distanceForInstance = 0; - if(params.patternMethod == 'Step Distance') distanceForInstance =params.distance*(i-1); - if(params.patternMethod == 'Span Distance') distanceForInstance =(params.distance / (params.qty-1))*(i-1); - - const trVec = params.direction.multiply(distanceForInstance); - - const tr = new Matrix3x4().setTranslation(trVec.x, trVec.y, trVec.z); - - const newShellName = shellToPatern.id + ":patern/" + index + "/" +i; - oci.copy(shellToPatern, newShellName); - SetLocation(newShellName, tr.toFlatArray()); - - created.push(occ.io.getShell(newShellName)); - } - + const newShellName = shellToPatern.id + ":patern" + index; + oci.copy(shellToPatern, newShellName); + //oci.step(); + //oci.tmirror(newShellName, ...params.face.csys.origin.data(), ...params.face.csys.z.normalize().data()); + created.push(occ.io.getShell(newShellName)); }); return { diff --git a/web/img/cad/deleteBody32.png b/web/img/cad/deleteBody32.png index ad92ed1f5530c90d5fdf29d4fb6554fee65ff70d..0ae208f3d5ba582d755d3e63c264eac6f796df5a 100644 GIT binary patch delta 4656 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