From 54741d5712f190381510ece6564fd2771e539f8c Mon Sep 17 00:00:00 2001 From: Mike Molinari Date: Wed, 20 Jul 2022 01:06:06 +0000 Subject: [PATCH] Patern qty working for linear patern. --- .../patternLinear/patternLinear.operation.ts | 28 +++++++++---------- .../patternRadial/patternRadial.operation.ts | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts b/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts index dfb1821e..1bcd9183 100644 --- a/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts +++ b/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts @@ -33,24 +33,24 @@ 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); - shellToPatern.csys; + console.log(i,distanceForInstance); + const trVec = params.direction.multiply(distanceForInstance); - const trVec = params.direction.multiply(params.distance); + 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 tr = new Matrix3x4().setTranslation(trVec.x, trVec.y, trVec.z); - - const newShellName = shellToPatern.id + ":patern/" + index; - oci.copy(shellToPatern, newShellName); - SetLocation(newShellName, tr.toFlatArray()); - - //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/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts b/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts index fa5ce996..423e7d10 100644 --- a/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts +++ b/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts @@ -61,8 +61,8 @@ export const PatternRadialOperation: OperationDescriptor = label: 'Pattern Method', name: "patternMethod", style: "dropdown", - defaultValue: "Step Distance", - values: ['Step Distance', 'Span Distance',], + defaultValue: "Step Angle", + values: ['Step Angle', 'Span Angle',], }, { type: 'number',