designix 0.5.31 → 0.5.32

package/dist/index.js

@@ -1975,7 +1975,7 @@ var pDef4 = {
     PHB: "pole_stator_holders.svg",
     PHD1A: "pole_stator_holders.svg",
     PHD1B: "pole_stator_holders.svg",
-    PHN1AB: "pole_stator_holders.svg",
+    PHN1AB: "pole_stator_holderB_top.svg",
     PHD5A: "pole_stator_holderB_top.svg",
     PHR4A: "pole_stator_holderB_top.svg",
     PHD3A: "pole_stator_holderB_top.svg",
@@ -2357,6 +2357,7 @@ import {
   contourCircle as contourCircle5,
   ctrRectangle,
   ctrRectRot,
+  ctrRectRot2,
   ctrTrapezoid,
   figure as figure5,
   degToRad as degToRad4,
@@ -2372,26 +2373,26 @@ var pDef5 = {
   partName: "rake",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber5("D1", "mm", 600, 10, 4e3, 10),
-    pNumber5("D2", "mm", 400, 10, 4e3, 10),
-    pNumber5("D3", "mm", 400, 10, 4e3, 10),
-    pNumber5("H1", "mm", 800, 1, 4e3, 10),
-    pNumber5("H2", "mm", 3e3, 20, 6e3, 10),
-    pNumber5("H3", "mm", 400, 0, 4e3, 10),
+    pNumber5("D1", "mm", 600, 10, 4e3, 1),
+    pNumber5("D2", "mm", 400, 10, 4e3, 1),
+    pNumber5("D3", "mm", 400, 10, 4e3, 1),
+    pNumber5("H1", "mm", 800, 1, 4e3, 1),
+    pNumber5("H2", "mm", 3e3, 20, 6e3, 1),
+    pNumber5("H3", "mm", 400, 0, 4e3, 1),
     pNumber5("E1", "mm", 20, 1, 80, 1),
     pNumber5("E3", "mm", 30, 1, 80, 1),
     pSectionSeparator4("transversal"),
-    pNumber5("H4", "mm", 400, 10, 1e3, 10),
-    pNumber5("D4", "mm", 300, 10, 1e3, 10),
+    pNumber5("H4", "mm", 400, 10, 1e3, 1),
+    pNumber5("D4", "mm", 300, 10, 1e3, 1),
     pNumber5("E4", "mm", 20, 1, 80, 1),
-    pNumber5("H5", "mm", 1e3, 10, 2e3, 10),
-    pNumber5("D5", "mm", 200, 1, 1e3, 10),
-    pNumber5("L4", "mm", 300, 1, 1e3, 10),
-    pNumber5("L5", "mm", 2e3, 10, 4e3, 10),
-    pNumber5("L6", "mm", 2e3, 1, 4e3, 10),
-    pNumber5("D8", "mm", 400, 1, 1e3, 10),
+    pNumber5("H5", "mm", 1e3, 10, 2e3, 1),
+    pNumber5("D5", "mm", 200, 1, 1e3, 1),
+    pNumber5("L4", "mm", 300, 1, 1e3, 1),
+    pNumber5("L5", "mm", 2e3, 10, 4e3, 1),
+    pNumber5("L6", "mm", 2e3, 1, 4e3, 1),
+    pNumber5("D8", "mm", 400, 1, 1e3, 1),
     pSectionSeparator4("diagonal"),
-    pNumber5("D6", "mm", 100, 1, 600, 10),
+    pNumber5("D6", "mm", 100, 1, 600, 1),
     pNumber5("E6", "mm", 10, 1, 80, 1),
     pNumber5("L7", "mm", 100, 1, 1e3, 1),
     pNumber5("L8", "mm", 200, 1, 1e3, 1),
@@ -2400,15 +2401,15 @@ var pDef5 = {
     pNumber5("D7", "mm", 40, 1, 100, 1),
     pNumber5("L1", "mm", 30, 1, 300, 1),
     pSectionSeparator4("door"),
-    pNumber5("H6", "mm", 100, 1, 1e3, 10),
-    pNumber5("H7", "mm", 600, 10, 2e3, 10),
-    pNumber5("L9", "mm", 300, 1, 1e3, 10),
+    pNumber5("H6", "mm", 100, 1, 1e3, 1),
+    pNumber5("H7", "mm", 600, 10, 2e3, 1),
+    pNumber5("L9", "mm", 300, 1, 1e3, 1),
     pNumber5("R9", "mm", 50, 0, 300, 1),
     pNumber5("doorOrientation", "degree", 0, -180, 180, 1)
   ],
   paramSvg: {
     D1: "rake_face.svg",
-    D2: "rake_face.svg",
+    D2: "rake_side.svg",
     D3: "rake_face.svg",
     H1: "rake_face.svg",
     H2: "rake_face.svg",
@@ -2458,6 +2459,9 @@ function pGeom5(t, param, suffix = "") {
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
+    const horiR = 0;
+    const vertiT = Math.PI / 2;
+    const vertiB = -Math.PI / 2;
     const R1 = param.D1 / 2;
     const R2 = param.D2 / 2;
     const R3 = param.D3 / 2;
@@ -2466,6 +2470,7 @@ function pGeom5(t, param, suffix = "") {
     const R6 = param.D6 / 2;
     const R7 = param.D7 / 2;
     const R8 = param.D8 / 2;
+    const D4h = param.D4 - 2 * param.E4;
     const H1H2 = param.H1 + param.H2;
     const H1H5 = H1H2 - param.H4 + param.H5;
     const beamL = 4 * param.L4 + param.L5 + 2 * param.L6;
@@ -2521,6 +2526,17 @@ function pGeom5(t, param, suffix = "") {
     if (param.L9 > param.D1) {
       throw `err180: L9 ${param.L9} too large compare to D1 ${param.D1}`;
     }
+    if (param.E6 > param.D6 / 2) {
+      throw `err197: E6 ${param.E6} is too large compare to D6 ${param.D6}`;
+    }
+    rGeome.logstr += `rake-L4: ${ffix7(param.L4)} mm (compare with swing)
+`;
+    rGeome.logstr += `rake-L5: ${ffix7(param.L5)} mm (compare with swing)
+`;
+    rGeome.logstr += `rake-L6: ${ffix7(param.L6)} mm (compare with swing)
+`;
+    rGeome.logstr += `rake-beamL (4*L4+L5+2*L6): ${ffix7(beamL)} mm (compare with swing)
+`;
     rGeome.logstr += `cone-height: ${ffix7(H1H2)} mm
 `;
     rGeome.logstr += `cone-height total: ${ffix7(H1H5)} mm
@@ -2554,10 +2570,8 @@ function pGeom5(t, param, suffix = "") {
     figCone.addMain(ctrCone(1));
     figCone.addSecond(ctrConePlus(1));
     figCone.addSecond(ctrConePlus(-1));
-    figCone.addSecond(ctrRectangle(-beamL / 2, beamH - R4, beamL, param.D4));
-    figCone.addSecond(
-      ctrRectangle(-beamL / 2, beamH - R4 + param.E4, beamL, param.D4 - 2 * param.E4)
-    );
+    figCone.addSecond(ctrRectRot2(-beamL / 2, beamH, beamL, param.D4, horiR));
+    figCone.addSecond(ctrRectRot2(-beamL / 2, beamH, beamL, D4h, horiR));
     for (const posX of handPos) {
       figCone.addSecond(
         ctrRectangle(posX, beamH + handLowY, param.L4, param.H5 - handLowY - handHighYint)
@@ -2577,8 +2591,8 @@ function pGeom5(t, param, suffix = "") {
     figBeam.addSecond(ctrConePlus(-1));
     figBeam.addSecond(ctrHand);
     figBeam.addSecond(contourCircle5(0, beamH + param.H5, R5));
-    figBeam.addSecond(ctrRectangle(-R6, param.H1 + param.L8, 2 * R6, wingLy));
-    figBeam.addSecond(ctrRectangle(-wingHR, param.H1 + param.L8, 2 * wingHR, wingLy));
+    figBeam.addSecond(ctrRectRot2(0, param.H1 + param.L8, wingLy, 2 * R6, vertiT));
+    figBeam.addSecond(ctrRectRot2(0, param.H1 + param.L8, wingLy, 2 * wingHR, vertiT));
     figBeam.addSecond(ctrDoor);
     figBeamHollow.addMain(contourCircle5(0, beamH, R4 - param.E4));
     figBeamHollow.addSecond(contourCircle5(0, beamH, R4));
@@ -2594,23 +2608,18 @@ function pGeom5(t, param, suffix = "") {
     }
     figDisc.addSecond(contourCircle5(0, 0, R1 - param.E1));
     figDisc.addSecond(contourCircle5(0, 0, R2));
-    figDisc.addSecond(ctrRectangle(-R4, -beamL / 2, param.D4, beamL));
-    figDisc.addSecond(ctrRectangle(-R4 + param.E4, -beamL / 2, param.D4 - 2 * param.E4, beamL));
+    figDisc.addSecond(ctrRectRot2(0, -beamL / 2, beamL, param.D4, vertiT));
+    figDisc.addSecond(ctrRectRot2(0, -beamL / 2, beamL, D4h, vertiT));
     for (const posX of handPos) {
-      figDisc.addSecond(ctrRectangle(-handLowX, posX, 2 * handLowX, param.L4));
-      figDisc.addSecond(ctrRectangle(-handHighXint, posX, 2 * handHighXint, param.L4));
-      figDisc.addSecond(ctrRectangle(-handHighXext, posX, 2 * handHighXext, param.L4));
-    }
-    figDisc.addSecond(ctrRectangle(-R6, R1 - param.L8 * Math.tan(coneAngle), 2 * R6, wingLx));
-    figDisc.addSecond(
-      ctrRectangle(-wingHR, R1 - param.L8 * Math.tan(coneAngle), 2 * wingHR, wingLx)
-    );
-    figDisc.addSecond(
-      ctrRectangle(-R6, -R1 + param.L8 * Math.tan(coneAngle) - wingLx, 2 * R6, wingLx)
-    );
-    figDisc.addSecond(
-      ctrRectangle(-wingHR, -R1 + param.L8 * Math.tan(coneAngle) - wingLx, 2 * wingHR, wingLx)
-    );
+      figDisc.addSecond(ctrRectRot2(0, posX, param.L4, 2 * handLowX, vertiT));
+      figDisc.addSecond(ctrRectRot2(0, posX, param.L4, 2 * handHighXint, vertiT));
+      figDisc.addSecond(ctrRectRot2(0, posX, param.L4, 2 * handHighXext, vertiT));
+    }
+    const py9 = R1 - param.L8 * Math.tan(coneAngle);
+    figDisc.addSecond(ctrRectRot2(0, py9, wingLx, 2 * R6, vertiT));
+    figDisc.addSecond(ctrRectRot2(0, py9, wingLx, 2 * wingHR, vertiT));
+    figDisc.addSecond(ctrRectRot2(0, -py9, wingLx, 2 * R6, vertiB));
+    figDisc.addSecond(ctrRectRot2(0, -py9, wingLx, 2 * wingHR, vertiB));
     figHand.addMain(ctrHand);
     figHand.addSecond(contourCircle5(0, beamH, R4));
     figHand.addSecond(contourCircle5(0, beamH, R4 - param.E4));
@@ -2622,10 +2631,8 @@ function pGeom5(t, param, suffix = "") {
     figDoor.addMain(ctrDoor);
     figDoor.addSecond(ctrConePlus(1));
     figDoor.addSecond(ctrConePlus(-1));
-    figDoor.addSecond(ctrRectangle(-beamL / 2, beamH - R4, beamL, param.D4));
-    figDoor.addSecond(
-      ctrRectangle(-beamL / 2, beamH - R4 + param.E4, beamL, param.D4 - 2 * param.E4)
-    );
+    figDoor.addSecond(ctrRectRot2(-beamL / 2, beamH, beamL, param.D4, horiR));
+    figDoor.addSecond(ctrRectRot2(-beamL / 2, beamH, beamL, D4h, horiR));
     for (const posX of handPos) {
       figDoor.addSecond(
         ctrRectangle(posX, beamH + handLowY, param.L4, param.H5 - handLowY - handHighYint)
@@ -3007,7 +3014,7 @@ var pDef7 = {
     pNumber7("H4", "mm", 100, 1, 400, 1),
     pNumber7("E2", "mm", 3, 1, 80, 1),
     pNumber7("L3", "mm", 500, 1, 4e3, 1),
-    pSectionSeparator6("radial"),
+    pSectionSeparator6("longitudinal"),
     pNumber7("L4", "mm", 600, 1, 4e3, 1),
     pNumber7("L5", "mm", 2e3, 1, 1e4, 1),
     pNumber7("L6", "mm", 2e3, 1, 1e4, 1),
@@ -3063,7 +3070,19 @@ function pGeom7(t, param, suffix = "") {
 `;
   try {
     const R1 = param.D1 / 2;
+    const rakeBeamL = 4 * param.L4 + param.L5 + 2 * param.L6 - 2 * param.H1;
+    const rakeL4 = param.L4 - 2 * param.H1;
+    const rakeL5 = param.L5 + 2 * param.H1;
+    const rakeL6 = param.L6 + 2 * param.H1;
     rGeome.logstr += `swing size: L1 ${ffix9(param.L1)} x L2 ${ffix9(param.L2)} mm
+`;
+    rGeome.logstr += `rake-L4: ${ffix9(rakeL4)} mm (compare with rake)
+`;
+    rGeome.logstr += `rake-L5: ${ffix9(rakeL5)} mm (compare with rake)
+`;
+    rGeome.logstr += `rake-L6: ${ffix9(rakeL6)} mm (compare with rake)
+`;
+    rGeome.logstr += `rake-beamL: (4*L4+L5+2*L6-2*H1) ${ffix9(rakeBeamL)} mm (compare with rake)
 `;
     figSide.addMain(contourCircle7(0, 0, R1));
     figSide.addMain(contourCircle7(0, 0, R1 - param.E1));
@@ -3218,23 +3237,23 @@ var pDef8 = {
   partName: "heliostat",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber8("H1", "mm", 3e3, 10, 4e4, 10),
-    pNumber8("H2", "mm", 2500, 50, 4e4, 10),
-    pNumber8("D1", "mm", 1e3, 20, 4e3, 10),
-    pNumber8("D2", "mm", 700, 20, 4e3, 10),
+    pNumber8("H1", "mm", 3e3, 10, 4e4, 1),
+    pNumber8("H2", "mm", 2500, 50, 4e4, 1),
+    pNumber8("D1", "mm", 1e3, 20, 4e3, 1),
+    pNumber8("D2", "mm", 700, 20, 4e3, 1),
     pNumber8("E1", "mm", 30, 1, 80, 1),
     pSectionSeparator7("rake"),
     pNumber8("H3", "mm", 200, 1, 500, 1),
     pNumber8("H4", "mm", 800, 1, 4e3, 1),
-    pNumber8("H5", "mm", 3e3, 50, 6e3, 10),
+    pNumber8("H5", "mm", 3e3, 50, 6e3, 1),
     pNumber8("H6", "mm", 200, 1, 4e3, 1),
     pNumber8("H7", "mm", 800, 1, 4e3, 1),
     pNumber8("H8", "mm", 200, 1, 4e3, 1),
-    pNumber8("D3", "mm", 900, 20, 4e3, 10),
-    pNumber8("D4", "mm", 400, 20, 4e3, 10),
-    pNumber8("D5", "mm", 300, 20, 1e3, 10),
-    pNumber8("D6", "mm", 200, 10, 1e3, 10),
-    pNumber8("D7", "mm", 400, 10, 1e3, 10),
+    pNumber8("D3", "mm", 900, 20, 4e3, 1),
+    pNumber8("D4", "mm", 400, 20, 4e3, 1),
+    pNumber8("D5", "mm", 300, 20, 1e3, 1),
+    pNumber8("D6", "mm", 200, 10, 1e3, 1),
+    pNumber8("D7", "mm", 400, 10, 1e3, 1),
     pSectionSeparator7("rake diagonal"),
     pNumber8("D9", "mm", 100, 1, 1e3, 1),
     pNumber8("L7", "mm", 100, 1, 1e3, 1),
@@ -3245,8 +3264,8 @@ var pDef8 = {
     pNumber8("S2", "mm", 200, 1, 800, 1),
     pNumber8("E2", "mm", 50, 1, 80, 1),
     pSectionSeparator7("swing"),
-    pNumber8("L1", "mm", 12500, 100, 4e4, 10),
-    pNumber8("L2", "mm", 6e3, 100, 4e4, 10),
+    pNumber8("L1", "mm", 12500, 100, 4e4, 1),
+    pNumber8("L2", "mm", 6e3, 100, 4e4, 1),
     pNumber8("L3", "mm", 100, 1, 500, 1),
     pNumber8("L4", "mm", 600, 1, 4e3, 1),
     pNumber8("L5", "mm", 2e3, 10, 6e3, 1),
@@ -3351,6 +3370,7 @@ function pGeom8(t, param, suffix = "") {
     rakeParam.setVal("E1", param.E1);
     rakeParam.setVal("E3", param.E1);
     rakeParam.setVal("E4", param.E1);
+    rakeParam.setVal("E6", param.E1);
     const rakeD3 = param.D2 * 0.6;
     const rakeN1 = 24;
     const rakeD7 = rakeD3 / (rakeN1 * 4);
@@ -3407,6 +3427,8 @@ function pGeom8(t, param, suffix = "") {
     swingParam.setVal("L5", param.L5);
     swingParam.setVal("L6", param.L6);
     swingParam.setVal("L3", param.D7);
+    swingParam.setVal("S1", param.D6 / 2);
+    swingParam.setVal("R2", 0);
     const poleStaticGeom = poleStaticDef.pGeom(
       0,
       poleStaticParam.getParamVal(),
@@ -3551,8 +3573,7 @@ import {
   checkGeom as checkGeom4,
   prefixLog as prefixLog4,
   contourCircle as contourCircle8,
-  ctrRectangle as ctrRectangle3,
-  ctrRectRot2,
+  ctrRectRot2 as ctrRectRot22,
   figure as figure9,
   radToDeg as radToDeg7,
   ffix as ffix11,
@@ -3566,11 +3587,11 @@ var pDef9 = {
   partName: "rake_stopper",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber9("D1", "mm", 600, 10, 4e3, 10),
-    pNumber9("D2", "mm", 400, 10, 4e3, 10),
+    pNumber9("D1", "mm", 600, 10, 4e3, 1),
+    pNumber9("D2", "mm", 400, 10, 4e3, 1),
     pNumber9("D3", "mm", 400, 1, 4e3, 1),
     pNumber9("H1", "mm", 800, 1, 4e3, 1),
-    pNumber9("H2", "mm", 3e3, 20, 6e3, 10),
+    pNumber9("H2", "mm", 3e3, 20, 6e3, 1),
     pNumber9("H3", "mm", 400, 0, 4e3, 1),
     pNumber9("E1", "mm", 20, 1, 80, 1),
     pNumber9("E3", "mm", 30, 1, 80, 1),
@@ -3621,7 +3642,7 @@ var pDef9 = {
   ],
   paramSvg: {
     D1: "rake_face.svg",
-    D2: "rake_face.svg",
+    D2: "rake_side.svg",
     D3: "rake_face.svg",
     H1: "rake_face.svg",
     H2: "rake_face.svg",
@@ -3697,6 +3718,10 @@ function pGeom9(t, param, suffix = "") {
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
+    const horiR = 0;
+    const horiL = Math.PI;
+    const vertiT = Math.PI / 2;
+    const vertiB = -Math.PI / 2;
     const R1 = param.D1 / 2;
     const H1H2 = param.H1 + param.H2;
     const H1H5 = H1H2 - param.H4 + param.H5;
@@ -3708,16 +3733,16 @@ function pGeom9(t, param, suffix = "") {
     const S1r = param.S1 / 2;
     const S1h = param.S1 - 2 * param.E7;
     const S1hr = S1h / 2;
-    const lowStopperTopPosX = -R1 - param.S1 / 2 - param.JS1;
     const S2s = param.S2 - S1r;
-    const lowSPosY = stopper1H - S1r;
     const lowSHPosZ = stopper1H - param.JH1;
     const JR1 = param.JD1 / 2;
     const JR1H = JR1 - param.JE1;
     const lowSHL = R1 + param.JS2;
-    const JR3 = param.JD3 / 2;
-    const JR4 = param.JD4 / 2;
     const Hi2SHpy = L5h - S1r;
+    const Hi1SHL = R1 + param.JS3;
+    const Hi1SHW = param.JD3 - 2 * param.JE3;
+    const Hi2SHL = param.D4 / 2 + param.JS4;
+    const Hi2SHW = param.JD4 - 2 * param.JE4;
     if (2 * param.E7 >= param.S1) {
       throw `err135: E7 ${param.E7} too large compare to S1 ${param.S1}`;
     }
@@ -3758,8 +3783,8 @@ function pGeom9(t, param, suffix = "") {
 `;
     rGeome.logstr += `cone-height total: ${ffix11(H1H5)} mm
 `;
-    figLowStopperHolderPre.addSecond(ctrRectangle3(-L5h, lowSPosY, param.L5, param.S1));
-    figLowStopperHolderPre.addSecond(ctrRectangle3(-L5h, lowSPosY + param.E7, param.L5, S1h));
+    figLowStopperHolderPre.addSecond(ctrRectRot22(-L5h, stopper1H, param.L5, param.S1, horiR));
+    figLowStopperHolderPre.addSecond(ctrRectRot22(-L5h, stopper1H, param.L5, S1h, horiR));
     figLowStopperHolderPre.addMain(contourCircle8(-param.JL1 / 2, lowSHPosZ, JR1));
     figLowStopperHolderPre.addMain(contourCircle8(-param.JL1 / 2, lowSHPosZ, JR1H));
     figLowStopperHolderPre.addMain(contourCircle8(param.JL1 / 2, lowSHPosZ, JR1));
@@ -3808,50 +3833,46 @@ function pGeom9(t, param, suffix = "") {
     figDoor.mergeFigure(rakeGeom.fig.faceDoor);
     figDoor.mergeFigure(figLowStopperHolderPre, true);
     figStopperTop.mergeFigure(rakeGeom.fig.faceDisc, true);
-    figStopperTop.addMain(ctrRectangle3(lowStopperTopPosX, -L5h, param.S1, param.L5));
-    figStopperTop.addMain(ctrRectangle3(lowStopperTopPosX + param.E7, -L5h, S1h, param.L5));
-    figStopperTop.addMain(ctrRectangle3(param.S2 - param.S1, -L5h, param.S1, param.L5));
-    figStopperTop.addMain(ctrRectangle3(param.S2 - param.E7 - S1h, -L5h, S1h, param.L5));
-    figStopperTop.addMain(ctrRectangle3(0, -L5h, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle3(0, -L5h + param.E7, S2s, S1h));
-    figStopperTop.addMain(ctrRectangle3(0, L5h - param.S1, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle3(0, L5h - param.S1 + param.E7, S2s, S1h));
-    figStopperTop.addMain(ctrRectangle3(0, -R1 - param.S1, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle3(0, -R1 - param.S1 + param.E7, S2s, S1h));
-    figStopperTop.addMain(ctrRectangle3(0, R1, S2s, param.S1));
-    figStopperTop.addMain(ctrRectangle3(0, R1 + param.E7, S2s, S1h));
-    figStopperTop.addSecond(ctrRectangle3(-lowSHL, -param.JL1 / 2 - JR1, lowSHL, 2 * JR1));
-    figStopperTop.addSecond(ctrRectangle3(-lowSHL, -param.JL1 / 2 - JR1H, lowSHL, 2 * JR1H));
-    figStopperTop.addSecond(ctrRectangle3(-lowSHL, param.JL1 / 2 - JR1, lowSHL, 2 * JR1));
-    figStopperTop.addSecond(ctrRectangle3(-lowSHL, param.JL1 / 2 - JR1H, lowSHL, 2 * JR1H));
-    const Hi1SHL = R1 + param.JS3;
-    const Hi1SHW = param.JD3 - 2 * param.JE3;
-    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2, -Hi1SHL, param.JD3, Hi1SHL));
-    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2 + param.JE3, -Hi1SHL, Hi1SHW, Hi1SHL));
-    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2, 0, param.JD3, Hi1SHL));
-    figStopperTop.addSecond(ctrRectangle3(-param.JD3 / 2 + param.JE3, 0, Hi1SHW, Hi1SHL));
+    figStopperTop.addMain(ctrRectRot22(-R1 - param.JS1, -L5h, param.L5, param.S1, vertiT));
+    figStopperTop.addMain(ctrRectRot22(-R1 - param.JS1, -L5h, param.L5, S1h, vertiT));
+    figStopperTop.addMain(ctrRectRot22(S2s, -L5h, param.L5, param.S1, vertiT));
+    figStopperTop.addMain(ctrRectRot22(S2s, -L5h, param.L5, S1h, vertiT));
+    figStopperTop.addMain(ctrRectRot22(0, -L5h + S1r, S2s, param.S1, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, -L5h + S1r, S2s, S1h, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, L5h - S1r, S2s, param.S1, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, L5h - S1r, S2s, S1h, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, -R1 - S1r, S2s, param.S1, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, -R1 - S1r, S2s, S1h, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, R1 + S1r, S2s, param.S1, horiR));
+    figStopperTop.addMain(ctrRectRot22(0, R1 + S1r, S2s, S1h, horiR));
+    figStopperTop.addSecond(ctrRectRot22(0, -param.JL1 / 2, lowSHL, 2 * JR1, horiL));
+    figStopperTop.addSecond(ctrRectRot22(0, -param.JL1 / 2, lowSHL, 2 * JR1H, horiL));
+    figStopperTop.addSecond(ctrRectRot22(0, param.JL1 / 2, lowSHL, 2 * JR1, horiL));
+    figStopperTop.addSecond(ctrRectRot22(0, param.JL1 / 2, lowSHL, 2 * JR1H, horiL));
+    figStopperTop.addSecond(ctrRectRot22(0, 0, Hi1SHL, param.JD3, vertiB));
+    figStopperTop.addSecond(ctrRectRot22(0, 0, Hi1SHL, Hi1SHW, vertiB));
+    figStopperTop.addSecond(ctrRectRot22(0, 0, Hi1SHL, param.JD3, vertiT));
+    figStopperTop.addSecond(ctrRectRot22(0, 0, Hi1SHL, Hi1SHW, vertiT));
     figStopperSide.mergeFigure(rakeGeom.fig.faceBeam, true);
     figStopperSide.addMain(contourCircle8(-R1 - param.JS1, stopper1H, S1r));
     figStopperSide.addMain(contourCircle8(-R1 - param.JS1, stopper1H, S1hr));
     figStopperSide.addMain(contourCircle8(S2s, stopper2H + S1r, S1r));
     figStopperSide.addMain(contourCircle8(S2s, stopper2H + S1r, S1hr));
-    figStopperSide.addSecond(ctrRectangle3(0, stopper2H, S2s, param.S1));
-    figStopperSide.addSecond(ctrRectangle3(0, stopper2H + param.E7, S2s, S1h));
+    figStopperSide.addSecond(ctrRectRot22(0, stopper2H + S1r, S2s, param.S1, horiR));
+    figStopperSide.addSecond(ctrRectRot22(0, stopper2H + S1r, S2s, S1h, horiR));
     const stopper3Ly = stopper2H + S1r - stopper3H;
     const stp3L = Math.sqrt(S2s ** 2 + stopper3Ly ** 2);
     const stp3A = Math.atan2(stopper3Ly, S2s);
     rGeome.logstr += `stopper-rod: L ${ffix11(stp3L)} mm, A ${ffix11(radToDeg7(stp3A))} degree
 `;
-    figStopperSide.addSecond(ctrRectRot2(0, stopper3H, stp3L, param.S1, stp3A));
-    figStopperSide.addSecond(ctrRectRot2(0, stopper3H, stp3L, S1h, stp3A));
-    figStopperSide.addSecond(ctrRectangle3(-lowSHL, lowSHPosZ - JR1, lowSHL, 2 * JR1));
-    figStopperSide.addSecond(ctrRectangle3(-lowSHL, lowSHPosZ - JR1H, lowSHL, 2 * JR1H));
+    figStopperSide.addSecond(ctrRectRot22(0, stopper3H, stp3L, param.S1, stp3A));
+    figStopperSide.addSecond(ctrRectRot22(0, stopper3H, stp3L, S1h, stp3A));
+    figStopperSide.addSecond(ctrRectRot22(0, lowSHPosZ, lowSHL, 2 * JR1, horiL));
+    figStopperSide.addSecond(ctrRectRot22(0, lowSHPosZ, lowSHL, 2 * JR1H, horiL));
     figStopperSide.addSecond(contourCircle8(0, stopper3H, param.JD3 / 2));
     figStopperSide.addSecond(contourCircle8(0, stopper3H, param.JD3 / 2 - param.JE3));
-    const Hi2SHL = param.D4 / 2 + param.JS4;
-    const Hi2SHW2 = param.JD4 / 2 - param.JE4;
-    figStopperSide.addSecond(ctrRectangle3(-param.JD4 / 2, Hi2SHpz, param.JD4, Hi2SHL));
-    figStopperSide.addSecond(ctrRectangle3(-Hi2SHW2, Hi2SHpz, 2 * Hi2SHW2, Hi2SHL));
+    figStopperSide.addSecond(ctrRectRot22(0, Hi2SHpz, Hi2SHL, param.JD4, vertiT));
+    figStopperSide.addSecond(ctrRectRot22(0, Hi2SHpz, Hi2SHL, Hi2SHW, vertiT));
     figStopperSideH.mergeFigure(figStopperSide, true);
     figStopperSideH.addMain(contourCircle8(-R1 - param.JS1, stopper1H, S1hr));
     figStopperSideH.addMain(contourCircle8(param.S2 - S1r, stopper2H + S1r, S1hr));
@@ -3881,25 +3902,22 @@ function pGeom9(t, param, suffix = "") {
     figStopperFaceBH.addMain(contourCircle8(R1 + S1r, 0, S1hr));
     figLowStopperHolder.mergeFigure(rakeGeom.fig.faceCone, true);
     figLowStopperHolder.mergeFigure(figLowStopperHolderPre);
-    const px8 = -Hi2SHpy - Hi2SHW2;
-    const px9 = Hi2SHpy - Hi2SHW2;
-    const py10 = stopper3H - Hi1SHW / 2;
-    figLowStopperHolder.addSecond(ctrRectangle3(-Hi2SHpy - JR4, Hi2SHpz, param.JD4, Hi2SHL));
-    figLowStopperHolder.addSecond(ctrRectangle3(px8, Hi2SHpz, 2 * Hi2SHW2, Hi2SHL));
-    figLowStopperHolder.addSecond(ctrRectangle3(Hi2SHpy - JR4, Hi2SHpz, param.JD4, Hi2SHL));
-    figLowStopperHolder.addSecond(ctrRectangle3(px9, Hi2SHpz, 2 * Hi2SHW2, Hi2SHL));
-    figLowStopperHolder.addSecond(ctrRectangle3(-Hi1SHL, stopper3H - JR3, Hi1SHL, param.JD3));
-    figLowStopperHolder.addSecond(ctrRectangle3(-Hi1SHL, py10, Hi1SHL, Hi1SHW));
-    figLowStopperHolder.addSecond(ctrRectangle3(0, stopper3H - JR3, Hi1SHL, param.JD3));
-    figLowStopperHolder.addSecond(ctrRectangle3(0, stopper3H - Hi1SHW / 2, Hi1SHL, Hi1SHW));
+    figLowStopperHolder.addSecond(ctrRectRot22(-Hi2SHpy, Hi2SHpz, Hi2SHL, param.JD4, vertiT));
+    figLowStopperHolder.addSecond(ctrRectRot22(-Hi2SHpy, Hi2SHpz, Hi2SHL, Hi2SHW, vertiT));
+    figLowStopperHolder.addSecond(ctrRectRot22(Hi2SHpy, Hi2SHpz, Hi2SHL, param.JD4, vertiT));
+    figLowStopperHolder.addSecond(ctrRectRot22(Hi2SHpy, Hi2SHpz, Hi2SHL, Hi2SHW, vertiT));
+    figLowStopperHolder.addSecond(ctrRectRot22(0, stopper3H, Hi1SHL, param.JD3, horiL));
+    figLowStopperHolder.addSecond(ctrRectRot22(0, stopper3H, Hi1SHL, Hi1SHW, horiL));
+    figLowStopperHolder.addSecond(ctrRectRot22(0, stopper3H, Hi1SHL, param.JD3, horiR));
+    figLowStopperHolder.addSecond(ctrRectRot22(0, stopper3H, Hi1SHL, Hi1SHW, horiR));
     figHi1StopperHolder.mergeFigure(figStopperSide, true);
     figHi1StopperHolder.addMain(contourCircle8(0, stopper3H, param.JD3 / 2));
     figHi1StopperHolder.addMain(contourCircle8(0, stopper3H, param.JD3 / 2 - param.JE3));
     figHi2StopperHolder.mergeFigure(figStopperTop, true);
-    figHi2StopperHolder.addMain(contourCircle8(0, -Hi2SHpy, JR4));
-    figHi2StopperHolder.addMain(contourCircle8(0, -Hi2SHpy, JR4 - param.JE4));
-    figHi2StopperHolder.addMain(contourCircle8(0, Hi2SHpy, JR4));
-    figHi2StopperHolder.addMain(contourCircle8(0, Hi2SHpy, JR4 - param.JE4));
+    figHi2StopperHolder.addMain(contourCircle8(0, -Hi2SHpy, param.JD4 / 2));
+    figHi2StopperHolder.addMain(contourCircle8(0, -Hi2SHpy, param.JD4 / 2 - param.JE4));
+    figHi2StopperHolder.addMain(contourCircle8(0, Hi2SHpy, param.JD4 / 2));
+    figHi2StopperHolder.addMain(contourCircle8(0, Hi2SHpy, param.JD4 / 2 - param.JE4));
     rGeome.fig = {
       faceCone: figCone,
       faceBeam: figBeam,
@@ -4085,22 +4103,22 @@ var pDef10 = {
   partName: "heliostat_2",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber10("H1", "mm", 3e3, 10, 4e4, 10),
-    pNumber10("H2", "mm", 2500, 50, 4e4, 10),
-    pNumber10("D1", "mm", 1e3, 20, 4e3, 10),
-    pNumber10("D2", "mm", 700, 20, 4e3, 10),
+    pNumber10("H1", "mm", 3e3, 10, 4e4, 1),
+    pNumber10("H2", "mm", 2500, 50, 4e4, 1),
+    pNumber10("D1", "mm", 1e3, 20, 4e3, 1),
+    pNumber10("D2", "mm", 700, 20, 4e3, 1),
     pNumber10("E1", "mm", 30, 1, 80, 1),
     pSectionSeparator9("rake"),
     pNumber10("H3", "mm", 200, 1, 500, 1),
     pNumber10("H4", "mm", 800, 1, 4e3, 1),
-    pNumber10("H5", "mm", 3e3, 50, 6e3, 10),
+    pNumber10("H5", "mm", 3e3, 50, 6e3, 1),
     pNumber10("H6", "mm", 200, 1, 4e3, 1),
     pNumber10("H7", "mm", 400, 1, 4e3, 1),
-    pNumber10("D3", "mm", 900, 20, 4e3, 10),
-    pNumber10("D4", "mm", 400, 20, 4e3, 10),
-    pNumber10("D5", "mm", 300, 20, 1e3, 10),
-    pNumber10("D6", "mm", 200, 10, 1e3, 10),
-    pNumber10("D7", "mm", 400, 10, 1e3, 10),
+    pNumber10("D3", "mm", 900, 20, 4e3, 1),
+    pNumber10("D4", "mm", 400, 20, 4e3, 1),
+    pNumber10("D5", "mm", 300, 20, 1e3, 1),
+    pNumber10("D6", "mm", 200, 10, 1e3, 1),
+    pNumber10("D7", "mm", 400, 10, 1e3, 1),
     pSectionSeparator9("rake diagonal"),
     pNumber10("D9", "mm", 100, 1, 1e3, 1),
     pNumber10("L7", "mm", 100, 1, 1e3, 1),
@@ -4108,11 +4126,11 @@ var pDef10 = {
     pSectionSeparator9("rake stopper"),
     pNumber10("S1", "mm", 100, 1, 800, 1),
     pSectionSeparator9("swing"),
-    pNumber10("L1", "mm", 12500, 100, 4e4, 10),
-    pNumber10("L2", "mm", 6e3, 100, 4e4, 10),
+    pNumber10("L1", "mm", 12500, 100, 4e4, 1),
+    pNumber10("L2", "mm", 6e3, 100, 4e4, 1),
     pNumber10("L3", "mm", 100, 1, 500, 1),
     pNumber10("L4", "mm", 600, 1, 4e3, 1),
-    pNumber10("L5", "mm", 2e3, 10, 6e3, 10),
+    pNumber10("L5", "mm", 2e3, 10, 6e3, 1),
     pNumber10("L6", "mm", 2e3, 1, 6e3, 1),
     pNumber10("H9", "mm", 100, 1, 400, 1),
     pSectionSeparator9("motion amplitude"),
@@ -4238,6 +4256,20 @@ function pGeom10(t, param, suffix = "") {
     rakeParam.setVal("L6", param.L6 + 2 * param.L3);
     rakeParam.setVal("S1", param.S1);
     rakeParam.setVal("S2", param.L2 / 2);
+    rakeParam.setVal("S3", 0);
+    rakeParam.setVal("S3", 0);
+    rakeParam.setVal("JD1", param.D3 / 4);
+    rakeParam.setVal("JE1", param.E1);
+    rakeParam.setVal("JL1", param.D3 / 3);
+    rakeParam.setVal("JH1", 0);
+    rakeParam.setVal("JS1", param.S1 / 2);
+    rakeParam.setVal("JS2", param.S1 / 2);
+    rakeParam.setVal("JD3", param.D4 / 4);
+    rakeParam.setVal("JE3", param.E1);
+    rakeParam.setVal("JS3", param.D4 / 4);
+    rakeParam.setVal("JD4", param.D4 / 4);
+    rakeParam.setVal("JE4", param.E1);
+    rakeParam.setVal("JS4", param.D4 / 4);
     swingParam.setVal("L2", param.L2);
     swingParam.setVal("D1", param.D6);
     swingParam.setVal("H3", param.H9);
@@ -4252,6 +4284,8 @@ function pGeom10(t, param, suffix = "") {
     swingParam.setVal("L5", param.L5);
     swingParam.setVal("L6", param.L6);
     swingParam.setVal("L3", param.D7);
+    swingParam.setVal("S1", param.D6 / 2);
+    swingParam.setVal("R2", 0);
     const poleStaticGeom = poleStaticDef.pGeom(
       0,
       poleStaticParam.getParamVal(),
@@ -4775,8 +4809,8 @@ function pGeom13(t, param, suffix = "") {
     }
     rGeome.logstr += `ring-height: ${ffix15(ringHeight)} mm
 `;
-    const tR1 = R3 - param.L2;
-    const tR2 = tR1 - param.L3;
+    const tR1 = R3 - param.L3;
+    const tR2 = tR1 - param.L2;
     const tA = 2 * Math.PI / (2 * param.N1);
     const ctrTeeth = contour12(tR1, 0);
     for (let i = 0; i < param.N1; i++) {
@@ -4808,7 +4842,7 @@ function pGeom13(t, param, suffix = "") {
       return rCtr;
     };
     const ctrGearTeeth = function(rnl) {
-      const rCtr = contour12(rnl * (R3 - param.L2), -param.H1).addSegStrokeR(-rnl * param.L3, 0).addSegStrokeR(0, -param.H2).addSegStrokeR(rnl * param.L3, 0).closeSegStroke();
+      const rCtr = contour12(rnl * (R3 - param.L3), -param.H1).addSegStrokeR(-rnl * param.L2, 0).addSegStrokeR(0, -param.H2).addSegStrokeR(rnl * param.L2, 0).closeSegStroke();
       return rCtr;
     };
     const ctrL = function(rnl) {
@@ -4887,9 +4921,9 @@ var pDef14 = {
   partName: "ring_guidance",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber14("D1", "mm", 700, 100, 2500, 1),
+    pNumber14("D1", "mm", 700, 5, 2500, 1),
     pNumber14("N1", "legs", 6, 1, 24, 1),
-    pNumber14("D2", "mm", 600, 100, 2e3, 1),
+    pNumber14("D2", "mm", 600, 5, 2e3, 1),
     pSectionSeparator13("leg details"),
     pNumber14("D3", "mm", 30, 1, 200, 1),
     pNumber14("D4", "mm", 50, 1, 200, 1),
@@ -5013,7 +5047,7 @@ var ringGuidanceDef = {
 // src/heliostat/vaxis_guidance.ts
 import {
   contourCircle as contourCircle13,
-  ctrRectangle as ctrRectangle4,
+  ctrRectangle as ctrRectangle3,
   figure as figure15,
   ffix as ffix17,
   pNumber as pNumber15,
@@ -5027,9 +5061,9 @@ var pDef15 = {
   partName: "vaxis_guidance",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber15("D1", "mm", 700, 100, 2500, 1),
+    pNumber15("D1", "mm", 700, 5, 2500, 1),
     pNumber15("N1", "legs", 6, 1, 24, 1),
-    pNumber15("D2", "mm", 600, 100, 2e3, 1),
+    pNumber15("D2", "mm", 600, 5, 2e3, 1),
     pSectionSeparator14("leg details"),
     pNumber15("D3", "mm", 30, 1, 200, 1),
     pNumber15("D4", "mm", 50, 1, 200, 1),
@@ -5044,7 +5078,7 @@ var pDef15 = {
     pNumber15("E2", "mm", 20, 1, 200, 1),
     pSectionSeparator14("spring"),
     pNumber15("SA1", "degree", 0, -45, 45, 1),
-    pNumber15("SE1", "mm", 10, 1, 200, 1),
+    pNumber15("SE1", "mm", 10, 0.1, 200, 0.1),
     pNumber15("SD1", "mm", 20, 1, 200, 1),
     pNumber15("SD2", "mm", 10, 1, 200, 1),
     pNumber15("SN1", "loops", 2, 0, 8, 1),
@@ -5115,10 +5149,10 @@ function pGeom15(t, param, suffix = "") {
     figTop.addMain(innerCtr);
     figTop.addSecond(contourCircle13(0, 0, param.Dvaxis / 2));
     const w1 = R1 - R6 + R4;
-    figSection.addMain(ctrRectangle4(R6, 0, w1, param.T1));
-    figSection.addMain(ctrRectangle4(-R6 - w1, 0, w1, param.T1));
-    figSection.addSecond(ctrRectangle4(R1 - R3, 0, 2 * R3, param.T1));
-    figSection.addSecond(ctrRectangle4(-R1 - R3, 0, 2 * R3, param.T1));
+    figSection.addMain(ctrRectangle3(R6, 0, w1, param.T1));
+    figSection.addMain(ctrRectangle3(-R6 - w1, 0, w1, param.T1));
+    figSection.addSecond(ctrRectangle3(R1 - R3, 0, 2 * R3, param.T1));
+    figSection.addSecond(ctrRectangle3(-R1 - R3, 0, 2 * R3, param.T1));
     rGeome.fig = {
       faceTop: figTop,
       faceSection: figSection
@@ -5164,7 +5198,7 @@ import {
   point as point6,
   contour as contour14,
   contourCircle as contourCircle14,
-  ctrRectangle as ctrRectangle5,
+  ctrRectangle as ctrRectangle4,
   figure as figure16,
   degToRad as degToRad7,
   ffix as ffix18,
@@ -5240,7 +5274,7 @@ function pGeom16(t, param, suffix = "") {
     const sA1 = Math.PI - sA0;
     const sA2 = Math.PI / 2 - Math.PI / 6 + sA0;
     if (Rinner + SR1 + param.SE1 > Rinner2) {
-      throw `err411: D8 ${param.D8} is too small compare to D5 ${param.D5}, E5 ${param.D5}, E8 ${param.E8}`;
+      throw `err411: D8 ${param.D8} is too small compare to D5 ${param.D5}, E5 ${param.E5}, E8 ${param.E8}`;
     }
     if (2 * Math.PI / 3 - 2 * aLeg < param.R9 / Rinner2) {
       throw `err412: L5 ${param.L5} is too large compare to R9 ${param.R9}`;
@@ -5272,9 +5306,9 @@ function pGeom16(t, param, suffix = "") {
     ctrProfile.addPointA(p23.cx, p23.cy).addSegArc(SR1 + param.SE1, false, true).addSegStrokeAP(-Math.PI / 6, Rinner).addSegStrokeAP(-Math.PI / 6, R8).addPointAP(Math.PI / 2, R8).addSegArc(R8, false, true).closeSegStroke();
     figProfile.addMain(ctrProfile);
     const R8plus = R8 * Math.sin(Math.PI / 6);
-    figSide.addMain(ctrRectangle5(0, -R8plus, param.L4, R8 + R8plus));
-    figSide.addSecond(ctrRectangle5(0, -R8, param.L4, 2 * R8));
-    figSide.addSecond(ctrRectangle5(0, -R5, param.L4, 2 * R5));
+    figSide.addMain(ctrRectangle4(0, -R8plus, param.L4, R8 + R8plus));
+    figSide.addSecond(ctrRectangle4(0, -R8, param.L4, 2 * R8));
+    figSide.addSecond(ctrRectangle4(0, -R5, param.L4, 2 * R5));
     rGeome.fig = {
       faceProfile: figProfile,
       faceSide: figSide

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "designix",
-	"version": "0.5.31",
+	"version": "0.5.32",
 	"description": "The first designs made with parametrix",
 	"type": "module",
 	"private": false,