designix 0.5.33 → 0.5.35

package/dist/index.js

@@ -1690,9 +1690,9 @@ var pDef3 = {
     pNumber3("PHD5", "mm", 800, 1, 4e3, 1),
     pNumber3("PHN1", "holes", 6, 1, 24, 1),
     pSectionSeparator2("screw holes"),
-    pNumber3("PHD3", "mm", 40, 2, 100, 1),
-    pNumber3("PHR4", "mm", 40, 2, 100, 1),
-    pNumber3("PHL2", "mm", 120, 5, 400, 1),
+    pNumber3("PHD3", "mm", 40, 1, 100, 1),
+    pNumber3("PHR4", "mm", 40, 1, 100, 1),
+    pNumber3("PHL2", "mm", 120, 1, 400, 1),
     pNumber3("PHR6", "mm", 20, 0, 400, 1),
     pSectionSeparator2("section"),
     pNumber3("PHE1", "mm", 10, 1, 80, 1),
@@ -1928,26 +1928,27 @@ var pDef4 = {
     pNumber4("E3", "mm", 40, 1, 100, 1),
     pSectionSeparator3("holders"),
     pCheckbox3("holders", true),
-    pNumber4("PHL1A", "mm", 400, 10, 1e3, 1),
-    pNumber4("PHL1B", "mm", 400, 10, 1e3, 1),
-    pNumber4("PHB", "mm", 5e3, 10, 2e4, 1),
-    pNumber4("PHD1A", "mm", 600, 10, 4e3, 1),
-    pNumber4("PHD1B", "mm", 380, 10, 4e3, 1),
+    pNumber4("PHL1A", "mm", 400, 1, 1e3, 1),
+    pNumber4("PHL1B", "mm", 400, 1, 1e3, 1),
+    pNumber4("PHB", "mm", 5e3, 1, 2e4, 1),
+    pNumber4("PHD1A", "mm", 600, 1, 4e3, 1),
+    pNumber4("PHD1B", "mm", 380, 1, 4e3, 1),
     pNumber4("PHN1AB", "petal", 6, 1, 24, 1),
     pSectionSeparator3("holder-B"),
-    pNumber4("PHD5B", "mm", 600, 10, 4e3, 1),
-    pNumber4("PHR4B", "mm", 30, 3, 400, 1),
-    pNumber4("PHD3B", "mm", 40, 3, 400, 1),
-    pNumber4("PHL2B", "mm", 140, 3, 400, 1),
+    pNumber4("PHD5B2", "mm", 600, 1, 4e3, 1),
+    pNumber4("PHD5B1", "mm", 600, 1, 4e3, 1),
+    pNumber4("PHR4B", "mm", 30, 1, 400, 1),
+    pNumber4("PHD3B", "mm", 40, 1, 400, 1),
+    pNumber4("PHL2B", "mm", 140, 1, 400, 1),
     pNumber4("PHE3B", "mm", 10, 1, 50, 1),
     pNumber4("PHR6B", "mm", 20, 0, 400, 1),
     pNumber4("PHE1B", "mm", 10, 1, 50, 1),
     pNumber4("PHH1B", "mm", 10, 1, 50, 1),
     pSectionSeparator3("holder-A"),
-    pNumber4("PHD5A", "mm", 900, 10, 4e3, 1),
-    pNumber4("PHR4A", "mm", 30, 3, 400, 1),
-    pNumber4("PHD3A", "mm", 40, 3, 400, 1),
-    pNumber4("PHL2A", "mm", 200, 3, 400, 1),
+    pNumber4("PHD5A", "mm", 900, 1, 4e3, 1),
+    pNumber4("PHR4A", "mm", 30, 1, 400, 1),
+    pNumber4("PHD3A", "mm", 40, 1, 400, 1),
+    pNumber4("PHL2A", "mm", 200, 1, 400, 1),
     pNumber4("PHE3A", "mm", 10, 1, 50, 1),
     pNumber4("PHR6A", "mm", 20, 0, 400, 1),
     pNumber4("PHE1A", "mm", 10, 1, 50, 1),
@@ -1984,7 +1985,8 @@ var pDef4 = {
     PHR6A: "pole_stator_holderB_top.svg",
     PHE1A: "pole_stator_holderB_section.svg",
     PHH1A: "pole_stator_holderB_section.svg",
-    PHD5B: "pole_stator_holderB_top.svg",
+    PHD5B1: "pole_stator_holderB_top.svg",
+    PHD5B2: "pole_stator_holderB_top.svg",
     PHR4B: "pole_stator_holderB_top.svg",
     PHD3B: "pole_stator_holderB_top.svg",
     PHL2B: "pole_stator_holderB_top.svg",
@@ -2129,7 +2131,7 @@ function pGeom4(t, param, suffix = "") {
       const vaxisHolderB2Param = designParam2(vaxisHolderDef.pDef, "B2");
       vaxisHolderB2Param.setVal("PHD1", param.PHD1B);
       vaxisHolderB2Param.setVal("PHD2", 2 * hb2R2);
-      vaxisHolderB2Param.setVal("PHD5", param.PHD5B);
+      vaxisHolderB2Param.setVal("PHD5", param.PHD5B2);
       vaxisHolderB2Param.setVal("PHN1", param.PHN1AB);
       vaxisHolderB2Param.setVal("PHD3", param.PHD3B);
       vaxisHolderB2Param.setVal("PHR4", param.PHR4B);
@@ -2165,7 +2167,7 @@ function pGeom4(t, param, suffix = "") {
       const vaxisHolderB1Param = designParam2(vaxisHolderDef.pDef, "B1");
       vaxisHolderB1Param.setVal("PHD1", param.PHD1B);
       vaxisHolderB1Param.setVal("PHD2", 2 * hb1R2);
-      vaxisHolderB1Param.setVal("PHD5", param.PHD5B);
+      vaxisHolderB1Param.setVal("PHD5", param.PHD5B1);
       vaxisHolderB1Param.setVal("PHN1", param.PHN1AB);
       vaxisHolderB1Param.setVal("PHD3", param.PHD3B);
       vaxisHolderB1Param.setVal("PHR4", param.PHR4B);
@@ -3005,8 +3007,8 @@ var pDef7 = {
   partName: "swing",
   params: [
     //pNumber(name, unit, init, min, max, step)
-    pNumber7("L1", "mm", 12500, 100, 4e4, 10),
-    pNumber7("L2", "mm", 6e3, 100, 4e4, 10),
+    pNumber7("L1", "mm", 12500, 100, 4e4, 1),
+    pNumber7("L2", "mm", 6e3, 100, 4e4, 1),
     pSectionSeparator6("radial"),
     pNumber7("D1", "mm", 400, 1, 1e3, 1),
     pNumber7("E1", "mm", 5, 1, 80, 1),
@@ -3022,12 +3024,13 @@ var pDef7 = {
     pNumber7("H3", "mm", 100, 1, 400, 1),
     pNumber7("E3", "mm", 3, 1, 80, 1),
     pSectionSeparator6("buttress"),
-    pNumber7("S1", "mm", 300, 0, 1e3, 1),
+    pNumber7("S1", "mm", 300, 0, 3e3, 1),
+    pNumber7("S2", "mm", 10, 0, 2e3, 1),
     pNumber7("R2", "mm", 100, 0, 1e3, 1),
     pSectionSeparator6("rod overlay"),
     pNumber7("rod1", "", 10, 1, 40, 1),
-    pNumber7("rod2", "mm", 1300, 10, 4e3, 10),
-    pNumber7("rod3", "mm", 400, 10, 1e3, 10),
+    pNumber7("rod2", "mm", 1300, 10, 4e3, 1),
+    pNumber7("rod3", "mm", 400, 10, 1e3, 1),
     pNumber7("rod4", "mm", 100, 1, 400, 1)
   ],
   paramSvg: {
@@ -3046,6 +3049,7 @@ var pDef7 = {
     E2: "swing_side.svg",
     E3: "swing_face.svg",
     S1: "swing_buttress.svg",
+    S2: "swing_buttress.svg",
     R2: "swing_buttress.svg",
     rod1: "swing_with_rod.svg",
     rod2: "swing_with_rod.svg",
@@ -3070,6 +3074,7 @@ function pGeom7(t, param, suffix = "") {
 `;
   try {
     const R1 = param.D1 / 2;
+    const lAE = R1 + param.S2;
     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;
@@ -3088,17 +3093,17 @@ function pGeom7(t, param, suffix = "") {
     figSide.addMain(contourCircle7(0, 0, R1 - param.E1));
     const sidePx = [-param.L2 / 2, -param.L3 - param.H2, param.L3, param.L2 / 2 - param.H2];
     for (const px of sidePx) {
-      figSide.addMain(ctrRectangle2(px, R1 - param.H4, param.H2, param.H4));
+      figSide.addMain(ctrRectangle2(px, lAE - param.H4, param.H2, param.H4));
       figSide.addMain(
         ctrRectangle2(
           px + param.E2,
-          R1 - param.H4 + param.E2,
+          lAE - param.H4 + param.E2,
           param.H2 - 2 * param.E2,
           param.H4 - 2 * param.E2
         )
       );
     }
-    figSide.addSecond(ctrRectangle2(-param.L2 / 2, R1, param.L2, param.H3));
+    figSide.addSecond(ctrRectangle2(-param.L2 / 2, lAE, param.L2, param.H3));
     const facePx = [];
     facePx.push(-param.L1 / 2);
     facePx.push(param.L1 / 2 - param.H1);
@@ -3113,18 +3118,18 @@ function pGeom7(t, param, suffix = "") {
       }
     }
     for (const px of facePx) {
-      figFace.addMain(ctrRectangle2(px, R1, param.H1, param.H3));
+      figFace.addMain(ctrRectangle2(px, lAE, param.H1, param.H3));
       figFace.addMain(
         ctrRectangle2(
           px + param.E3,
-          R1 + param.E3,
+          lAE + param.E3,
           param.H1 - 2 * param.E3,
           param.H3 - 2 * param.E3
         )
       );
     }
     figFace.addSecond(ctrRectangle2(-param.L1 / 2, -R1, param.L1, param.D1));
-    figFace.addSecond(ctrRectangle2(-param.L1 / 2, R1 - param.H4, param.L1, param.H4));
+    figFace.addSecond(ctrRectangle2(-param.L1 / 2, lAE - param.H4, param.L1, param.H4));
     for (const px of facePx) {
       figTop.addSecond(ctrRectangle2(px, -param.L2 / 2, param.H1, param.L2));
     }
@@ -3132,12 +3137,13 @@ function pGeom7(t, param, suffix = "") {
       figTop.addSecond(ctrRectangle2(-param.L1 / 2, py, param.L1, param.H2));
     }
     figTop.addSecond(ctrRectangle2(-param.L1 / 2, -R1, param.L1, param.D1));
-    const aBAC = Math.atan2(param.S1, R1);
-    const aDAB = 2 * aBAC;
+    const lAC = Math.sqrt(lAE ** 2 + param.S1 ** 2);
+    const aBAC = Math.acos(R1 / lAC);
+    const aEAC = Math.atan2(param.S1, lAE);
     const pA = point5(0, 0);
-    const pB = point5(0, R1);
-    const pD = pB.rotate(pA, aDAB);
-    const ctrButtress = contour9(-param.L3, R1).addSegStrokeA(-param.S1, R1).addCornerRounded(param.R2).addSegStrokeA(pD.cx, pD.cy).addPointA(0, -R1).addPointA(-pD.cx, pD.cy).addSegArc2().addSegStrokeA(param.S1, R1).addCornerRounded(param.R2).addSegStrokeA(param.L3, R1).addSegStrokeA(param.L3, R1 + param.E3).addSegStrokeA(-param.L3, R1 + param.E3).closeSegStroke();
+    const pF = pA.translatePolar(Math.PI / 2 + aEAC, R1);
+    const pD = pF.rotate(pA, aBAC);
+    const ctrButtress = contour9(-param.L3, lAE).addSegStrokeA(-param.S1, lAE).addCornerRounded(param.R2).addSegStrokeA(pD.cx, pD.cy).addPointA(0, -R1).addPointA(-pD.cx, pD.cy).addSegArc2().addSegStrokeA(param.S1, lAE).addCornerRounded(param.R2).addSegStrokeA(param.L3, lAE).addSegStrokeA(param.L3, lAE + param.E3).addSegStrokeA(-param.L3, lAE + param.E3).closeSegStroke();
     figButtress.addMain(ctrButtress);
     figButtress.addMain(contourCircle7(0, 0, R1 - param.E1));
     figSide.addSecond(ctrButtress);
@@ -4133,6 +4139,7 @@ var pDef10 = {
     pNumber10("L5", "mm", 2e3, 10, 6e3, 1),
     pNumber10("L6", "mm", 2e3, 1, 6e3, 1),
     pNumber10("H9", "mm", 100, 1, 400, 1),
+    pNumber10("S2", "mm", 10, 0, 2e3, 1),
     pSectionSeparator9("motion amplitude"),
     pNumber10("al", "degree", 80, 0, 95, 1)
   ],
@@ -4162,8 +4169,9 @@ var pDef10 = {
     L6: "heliostat2_face_sizing.svg",
     L7: "heliostat2_face_sizing.svg",
     L8: "heliostat2_face_sizing.svg",
-    al: "heliostat2_side_sizing.svg",
-    S1: "heliostat2_side_sizing.svg"
+    S1: "heliostat2_side_sizing.svg",
+    S2: "heliostat2_side_sizing.svg",
+    al: "heliostat2_side_sizing.svg"
   },
   sim: {
     tMax: 100,
@@ -4285,6 +4293,7 @@ function pGeom10(t, param, suffix = "") {
     swingParam.setVal("L6", param.L6);
     swingParam.setVal("L3", param.D7);
     swingParam.setVal("S1", param.D6 / 2);
+    swingParam.setVal("S2", param.S2);
     swingParam.setVal("R2", 0);
     const poleStaticGeom = poleStaticDef.pGeom(
       0,