designix 0.5.22 → 0.5.24

package/dist/index.js

@@ -1023,8 +1023,8 @@ var pDef = {
     // every 0.5 second
   }
 };
-function pGeom(t, param) {
-  const rGeome = initGeom(pDef.partName);
+function pGeom(t, param, suffix = "") {
+  const rGeome = initGeom(pDef.partName + suffix);
   const figOne = figure();
   const figTwo = figure();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
@@ -1334,14 +1334,14 @@ var pDef2 = {
     // every 0.5 second
   }
 };
-function pGeom2(t, param) {
-  const rGeome = initGeom2(pDef2.partName);
+function pGeom2(t, param, suffix = "") {
+  const rGeome = initGeom2(pDef2.partName + suffix);
   const figOne = figure2();
   const figTwo = figure2();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
-    const gearWWParam = designParam(gearWheelWheelDef.pDef);
+    const gearWWParam = designParam(gearWheelWheelDef.pDef, "ref1");
     gearWWParam.setVal("module", param.module);
     gearWWParam.setVal("N1", param.N1);
     gearWWParam.setVal("c1x", param.c1x);
@@ -1369,9 +1369,13 @@ function pGeom2(t, param) {
     gearWWParam.setVal("wheelAxisExtRound", param.wheelAxisExtRound);
     gearWWParam.setVal("wheelAxisIntRound", param.wheelAxisIntRound);
     gearWWParam.setVal("wheelExtraRound", param.wheelExtraRound);
-    const gearWWGeom = gearWheelWheelDef.pGeom(t, gearWWParam.getParamVal());
+    const gearWWGeom = gearWheelWheelDef.pGeom(
+      t,
+      gearWWParam.getParamVal(),
+      gearWWParam.getSuffix()
+    );
     checkGeom(gearWWGeom);
-    rGeome.logstr += prefixLog(gearWWGeom.logstr, gearWWParam.partName);
+    rGeome.logstr += prefixLog(gearWWGeom.logstr, gearWWParam.getPartNameSuffix());
     figOne.mergeFigure(gearWWGeom.fig.teethProfile);
     figTwo.mergeFigure(gearWWGeom.fig.axisProfile);
     rGeome.fig = { teethProfile: figOne, axisProfile: figTwo };
@@ -1487,10 +1491,10 @@ var pDef3 = {
     // every 0.5 second
   }
 };
-function pGeom3(t, param) {
+function pGeom3(t, param, suffix = "") {
+  const rGeome = initGeom3(pDef3.partName + suffix);
   let ctrPoleProfile;
   let ctrDoorFace;
-  const rGeome = initGeom3(pDef3.partName);
   const figCut = figure3();
   const figFace = figure3();
   const figBottom = figure3();
@@ -1737,11 +1741,11 @@ var pDef4 = {
     // every 0.5 second
   }
 };
-function pGeom4(t, param) {
+function pGeom4(t, param, suffix = "") {
+  const rGeome = initGeom4(pDef4.partName + suffix);
   let ctrCone;
   let ctrConePlus;
   let ctrRect;
-  const rGeome = initGeom4(pDef4.partName);
   const figCone = figure4();
   const figBeam = figure4();
   const figBeamHollow = figure4();
@@ -2122,10 +2126,10 @@ var pDef5 = {
     // every 0.5 second
   }
 };
-function pGeom5(t, param) {
+function pGeom5(t, param, suffix = "") {
+  const rGeome = initGeom5(pDef5.partName + suffix);
   let ctrSquare;
   let ctrRect;
-  const rGeome = initGeom5(pDef5.partName);
   const figLegs = figure5();
   const figTube = figure5();
   const figBody = figure5();
@@ -2320,10 +2324,10 @@ var pDef6 = {
     // every 0.5 second
   }
 };
-function pGeom6(t, param) {
+function pGeom6(t, param, suffix = "") {
+  const rGeome = initGeom6(pDef6.partName + suffix);
   let ctrRectangle;
   let ctrRectRound;
-  const rGeome = initGeom6(pDef6.partName);
   const figSide = figure6();
   const figFace = figure6();
   const figTop = figure6();
@@ -2541,8 +2545,8 @@ var pDef7 = {
     // every 0.5 second
   }
 };
-function pGeom7(t, param) {
-  const rGeome = initGeom7(pDef7.partName);
+function pGeom7(t, param, suffix = "") {
+  const rGeome = initGeom7(pDef7.partName + suffix);
   const figSide = figure7();
   const figFace = figure7();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
@@ -2650,18 +2654,22 @@ function pGeom7(t, param) {
     swingParam.setVal("L5", param.L5);
     swingParam.setVal("L6", param.L6);
     swingParam.setVal("L3", param.D7);
-    const poleStaticGeom = poleStaticDef.pGeom(0, poleStaticParam.getParamVal());
+    const poleStaticGeom = poleStaticDef.pGeom(
+      0,
+      poleStaticParam.getParamVal(),
+      poleStaticParam.getSuffix()
+    );
     checkGeom2(poleStaticGeom);
-    rGeome.logstr += prefixLog2(poleStaticGeom.logstr, poleStaticParam.partName);
-    const rakeGeom = rakeDef.pGeom(0, rakeParam.getParamVal());
+    rGeome.logstr += prefixLog2(poleStaticGeom.logstr, poleStaticParam.getPartNameSuffix());
+    const rakeGeom = rakeDef.pGeom(0, rakeParam.getParamVal(), rakeParam.getSuffix());
     checkGeom2(rakeGeom);
-    rGeome.logstr += prefixLog2(rakeGeom.logstr, rakeParam.partName);
-    const spiderGeom = spiderDef.pGeom(0, spiderParam.getParamVal());
+    rGeome.logstr += prefixLog2(rakeGeom.logstr, rakeParam.getPartNameSuffix());
+    const spiderGeom = spiderDef.pGeom(0, spiderParam.getParamVal(), spiderParam.getSuffix());
     checkGeom2(spiderGeom);
-    rGeome.logstr += prefixLog2(spiderGeom.logstr, spiderParam.partName);
-    const swingGeom = swingDef.pGeom(0, swingParam.getParamVal());
+    rGeome.logstr += prefixLog2(spiderGeom.logstr, spiderParam.getPartNameSuffix());
+    const swingGeom = swingDef.pGeom(0, swingParam.getParamVal(), swingParam.getSuffix());
     checkGeom2(swingGeom);
-    rGeome.logstr += prefixLog2(swingGeom.logstr, swingParam.partName);
+    rGeome.logstr += prefixLog2(swingGeom.logstr, swingParam.getPartNameSuffix());
     figSide.mergeFigure(poleStaticGeom.fig.poleCut);
     figSide.mergeFigure(rakeGeom.fig.faceBeam.translate(0, rakePosY));
     figSide.mergeFigure(
@@ -2874,9 +2882,9 @@ var pDef8 = {
     // every 0.5 second
   }
 };
-function pGeom8(t, param) {
+function pGeom8(t, param, suffix = "") {
+  const rGeome = initGeom8(pDef8.partName + suffix);
   let ctrRect;
-  const rGeome = initGeom8(pDef8.partName);
   const figCone = figure8();
   const figBeam = figure8();
   const figBeamHollow = figure8();
@@ -2951,9 +2959,9 @@ function pGeom8(t, param) {
     rakeParam.setVal("H7", param.H7);
     rakeParam.setVal("L9", param.L9);
     rakeParam.setVal("R9", param.R9);
-    const rakeGeom = rakeDef.pGeom(0, rakeParam.getParamVal());
+    const rakeGeom = rakeDef.pGeom(0, rakeParam.getParamVal(), rakeParam.getSuffix());
     checkGeom3(rakeGeom);
-    rGeome.logstr += prefixLog3(rakeGeom.logstr, rakeParam.partName);
+    rGeome.logstr += prefixLog3(rakeGeom.logstr, rakeParam.getPartNameSuffix());
     figCone.mergeFigure(rakeGeom.fig.faceCone);
     figBeam.mergeFigure(rakeGeom.fig.faceBeam);
     figBeamHollow.mergeFigure(rakeGeom.fig.faceBeamHollow);
@@ -3221,8 +3229,8 @@ var pDef9 = {
     // every 0.5 second
   }
 };
-function pGeom9(t, param) {
-  const rGeome = initGeom9(pDef9.partName);
+function pGeom9(t, param, suffix = "") {
+  const rGeome = initGeom9(pDef9.partName + suffix);
   const figSide = figure9();
   const figFace = figure9();
   const figTop = figure9();
@@ -3318,15 +3326,19 @@ function pGeom9(t, param) {
     swingParam.setVal("L5", param.L5);
     swingParam.setVal("L6", param.L6);
     swingParam.setVal("L3", param.D7);
-    const poleStaticGeom = poleStaticDef.pGeom(0, poleStaticParam.getParamVal());
+    const poleStaticGeom = poleStaticDef.pGeom(
+      0,
+      poleStaticParam.getParamVal(),
+      poleStaticParam.getSuffix()
+    );
     checkGeom4(poleStaticGeom);
-    rGeome.logstr += prefixLog4(poleStaticGeom.logstr, poleStaticParam.partName);
-    const rakeGeom = rakeStopperDef.pGeom(0, rakeParam.getParamVal());
+    rGeome.logstr += prefixLog4(poleStaticGeom.logstr, poleStaticParam.getPartNameSuffix());
+    const rakeGeom = rakeStopperDef.pGeom(0, rakeParam.getParamVal(), rakeParam.getSuffix());
     checkGeom4(rakeGeom);
-    rGeome.logstr += prefixLog4(rakeGeom.logstr, rakeParam.partName);
-    const swingGeom = swingDef.pGeom(0, swingParam.getParamVal());
+    rGeome.logstr += prefixLog4(rakeGeom.logstr, rakeParam.getPartNameSuffix());
+    const swingGeom = swingDef.pGeom(0, swingParam.getParamVal(), swingParam.getSuffix());
     checkGeom4(swingGeom);
-    rGeome.logstr += prefixLog4(swingGeom.logstr, swingParam.partName);
+    rGeome.logstr += prefixLog4(swingGeom.logstr, swingParam.getPartNameSuffix());
     figSide.mergeFigure(poleStaticGeom.fig.poleCut);
     figSide.mergeFigure(rakeGeom.fig.faceStopperSide.translate(0, rakePosY));
     figSide.mergeFigure(
@@ -3475,11 +3487,11 @@ var pDef10 = {
     // every 0.5 second
   }
 };
-function pGeom10(t, param) {
+function pGeom10(t, param, suffix = "") {
+  const rGeome = initGeom10(pDef10.partName + suffix);
   let ctrBaseCut1;
   let ctrBaseCut2;
   let ctrHollow;
-  const rGeome = initGeom10(pDef10.partName);
   const figCut = figure10();
   const figTop = figure10();
   const figHollow = figure10();
@@ -3671,9 +3683,9 @@ var pDef11 = {
     // every 0.5 second
   }
 };
-function pGeom11(t, param) {
+function pGeom11(t, param, suffix = "") {
+  const rGeome = initGeom11(pDef11.partName + suffix);
   let ctrPoleProfile;
-  const rGeome = initGeom11(pDef11.partName);
   const figCut = figure11();
   const figBottom = figure11();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
@@ -3812,10 +3824,10 @@ var pDef12 = {
     // every 0.5 second
   }
 };
-function pGeom12(t, param) {
+function pGeom12(t, param, suffix = "") {
+  const rGeome = initGeom12(pDef12.partName + suffix);
   let ctrPlate;
   let ctrRod;
-  const rGeome = initGeom12(pDef12.partName);
   const figCut = figure12();
   const figPlate = figure12();
   const figTop = figure12();
@@ -3984,10 +3996,10 @@ var pDef13 = {
     // every 0.5 second
   }
 };
-function pGeom13(t, param) {
+function pGeom13(t, param, suffix = "") {
+  const rGeome = initGeom13(pDef13.partName + suffix);
   let ctrRodFootprint;
   let ctrRod;
-  const rGeome = initGeom13(pDef13.partName);
   const figFrame = figure13();
   const figPlate = figure13();
   const figRod = figure13();
@@ -4379,8 +4391,8 @@ var pDef14 = {
   partName: "surface",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber14("LH", "mm", 1600, 100, 4e3, 1),
-    pNumber14("LV", "mm", 1e3, 100, 4e3, 1),
+    pNumber14("LH", "mm", 1600, 10, 4e3, 1),
+    pNumber14("LV", "mm", 1e3, 10, 4e3, 1),
     pNumber14("LZ", "mm", 40, 0, 100, 1),
     pNumber14("nx", "", 9, 1, 40, 1),
     pNumber14("ny", "", 9, 1, 40, 1),
@@ -4436,9 +4448,9 @@ var pDef14 = {
     // every 0.5 second
   }
 };
-function pGeom14(t, param) {
+function pGeom14(t, param, suffix = "") {
+  const rGeome = initGeom14(pDef14.partName + suffix);
   let ctrPanelProfile;
-  const rGeome = initGeom14(pDef14.partName);
   const figSurface = figure14();
   const figOnePanel = figure14();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
@@ -4471,6 +4483,7 @@ function pGeom14(t, param) {
     const ELateralCycle = param.main_direction === 0 ? param.EV_cycle : param.EH_cycle;
     const ELateralStart = param.main_direction === 0 ? param.EV_start : param.EH_start;
     const ELateralShape = param.main_direction === 0 ? param.EV_shape : param.EH_shape;
+    const lenLateralMax = Math.max(lenLateral, param.first_row, param.second_row);
     const lenRow = [];
     for (let i = 0; i < lenMain; i++) {
       const iEven = (i + 1) % 2;
@@ -4528,10 +4541,10 @@ function pGeom14(t, param) {
       eMainCumul.push(eMainTotal);
     });
     const eLateral = [];
-    for (let i = 0; i < lenLateral - 1; i++) {
+    for (let i = 0; i < lenLateralMax - 1; i++) {
       let eSpace = ELateral;
       if (ELateralGradient === 1) {
-        const gapNb = lenLateral > 2 ? lenLateral - 2 : 1;
+        const gapNb = lenLateralMax > 2 ? lenLateralMax - 2 : 1;
         const phase = (ELateralStart + i * ELateralCycle / gapNb) % 1;
         switch (ELateralShape) {
           case 0:
@@ -4563,9 +4576,9 @@ function pGeom14(t, param) {
     let gLenVertical = 0;
     if (param.main_direction === 0) {
       gLenHorizontal = lenMain * param.LH + eMainTotal;
-      gLenVertical = lenLateral * param.LV + eLateralTotal;
+      gLenVertical = lenLateralMax * param.LV + eLateralTotal;
     } else {
-      gLenHorizontal = lenLateral * param.LH + eLateralTotal;
+      gLenHorizontal = lenLateralMax * param.LH + eLateralTotal;
       gLenVertical = lenMain * param.LV + eMainTotal;
     }
     const gArea = gLenHorizontal * gLenVertical / 10 ** 6;
@@ -4585,8 +4598,8 @@ function pGeom14(t, param) {
     };
     const panelPositions = [];
     lenRow.forEach((oneRow, rowIdx) => {
-      const half = (lenLateral - oneRow) % 2;
-      const offset = Math.floor((lenLateral - oneRow) / 2);
+      const half = (lenLateralMax - oneRow) % 2;
+      const offset = Math.floor((lenLateralMax - oneRow) / 2);
       for (let pIdx = 0; pIdx < oneRow; pIdx++) {
         let dx = 0;
         let dy = 0;
@@ -4676,8 +4689,8 @@ var pDef15 = {
     tUpdate: 500
   }
 };
-function pGeom15(t, param) {
-  const rGeome = initGeom15(pDef15.partName);
+function pGeom15(t, param, suffix = "") {
+  const rGeome = initGeom15(pDef15.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -4725,8 +4738,8 @@ var pDef16 = {
     tUpdate: 500
   }
 };
-function pGeom16(t, param) {
-  const rGeome = initGeom16(pDef16.partName);
+function pGeom16(t, param, suffix = "") {
+  const rGeome = initGeom16(pDef16.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -4784,8 +4797,8 @@ var pDef17 = {
     // every 0.5 second
   }
 };
-function pGeom17(t, param) {
-  const rGeome = initGeom17(pDef17.partName);
+function pGeom17(t, param, suffix = "") {
+  const rGeome = initGeom17(pDef17.partName + suffix);
   const figFace = figure17();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
@@ -4840,8 +4853,8 @@ var pDef18 = {
     // every 0.5 second
   }
 };
-function pGeom18(t, param) {
-  const rGeome = initGeom18(pDef18.partName);
+function pGeom18(t, param, suffix = "") {
+  const rGeome = initGeom18(pDef18.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -4900,8 +4913,8 @@ var pDef19 = {
     // every 0.5 second
   }
 };
-function pGeom19(t, param) {
-  const rGeome = initGeom19(pDef19.partName);
+function pGeom19(t, param, suffix = "") {
+  const rGeome = initGeom19(pDef19.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -4960,8 +4973,8 @@ var pDef20 = {
     // every 0.5 second
   }
 };
-function pGeom20(t, param) {
-  const rGeome = initGeom20(pDef20.partName);
+function pGeom20(t, param, suffix = "") {
+  const rGeome = initGeom20(pDef20.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5036,8 +5049,8 @@ var pDef21 = {
     // every 0.5 second
   }
 };
-function pGeom21(t, param) {
-  const rGeome = initGeom21(pDef21.partName);
+function pGeom21(t, param, suffix = "") {
+  const rGeome = initGeom21(pDef21.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5106,8 +5119,8 @@ var pDef22 = {
     // every 0.5 second
   }
 };
-function pGeom22(t, param) {
-  const rGeome = initGeom22(pDef22.partName);
+function pGeom22(t, param, suffix = "") {
+  const rGeome = initGeom22(pDef22.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5170,8 +5183,8 @@ var pDef23 = {
     // every 0.5 second
   }
 };
-function pGeom23(t, param) {
-  const rGeome = initGeom23(pDef23.partName);
+function pGeom23(t, param, suffix = "") {
+  const rGeome = initGeom23(pDef23.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5232,8 +5245,8 @@ var pDef24 = {
     // every 0.5 second
   }
 };
-function pGeom24(t, param) {
-  const rGeome = initGeom24(pDef24.partName);
+function pGeom24(t, param, suffix = "") {
+  const rGeome = initGeom24(pDef24.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5306,8 +5319,8 @@ var pDef25 = {
     // every 0.5 second
   }
 };
-function pGeom25(t, param) {
-  const rGeome = initGeom25(pDef25.partName);
+function pGeom25(t, param, suffix = "") {
+  const rGeome = initGeom25(pDef25.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5411,8 +5424,8 @@ var pDef26 = {
     // every 0.5 second
   }
 };
-function pGeom26(t, param) {
-  const rGeome = initGeom26(pDef26.partName);
+function pGeom26(t, param, suffix = "") {
+  const rGeome = initGeom26(pDef26.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5556,8 +5569,8 @@ var pDef27 = {
     // every 0.5 second
   }
 };
-function pGeom27(t, param) {
-  const rGeome = initGeom27(pDef27.partName);
+function pGeom27(t, param, suffix = "") {
+  const rGeome = initGeom27(pDef27.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -5646,8 +5659,8 @@ var pDef28 = {
     tUpdate: 500
   }
 };
-function pGeom28(t, param) {
-  const rGeome = initGeom28(pDef28.partName);
+function pGeom28(t, param, suffix = "") {
+  const rGeome = initGeom28(pDef28.partName + suffix);
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "designix",
-	"version": "0.5.22",
+	"version": "0.5.24",
 	"description": "The first designs made with parametrix",
 	"private": false,
 	"repository": {