designix 0.5.30 → 0.5.31

package/dist/index.js

@@ -1448,6 +1448,7 @@ import {
   prefixLog as prefixLog2,
   contour as contour6,
   contourCircle as contourCircle4,
+  ctrOblong,
   figure as figure4,
   radToDeg as radToDeg3,
   ffix as ffix6,
@@ -2091,8 +2092,13 @@ function pGeom4(t, param, suffix = "") {
     }
     const ctrDoorFace = function(pL2) {
       const R4b = R4 - pL2;
-      const H3b = param.H3 + R4;
-      const rCtrDoorFace = contour6(R4b, H3b + doorStraightLenght).addPointR(-R4b, R4b).addSegArc(R4b, false, true).addPointR(-R4b, -R4b).addSegArc(R4b, false, true).addSegStrokeR(0, -doorStraightLenght).addPointR(R4b, -R4b).addSegArc(R4b, false, true).addPointR(R4b, R4b).addSegArc(R4b, false, true).closeSegStroke();
+      const rCtrDoorFace = ctrOblong(
+        0,
+        param.H3 + R4 - R4b,
+        2 * R4b,
+        doorStraightLenght + 2 * R4b,
+        Math.PI / 2
+      );
       return rCtrDoorFace;
     };
     figFace.addMain(ctrDoorFace(0));
@@ -2351,6 +2357,7 @@ import {
   contourCircle as contourCircle5,
   ctrRectangle,
   ctrRectRot,
+  ctrTrapezoid,
   figure as figure5,
   degToRad as degToRad4,
   radToDeg as radToDeg4,
@@ -2536,7 +2543,14 @@ function pGeom5(t, param, suffix = "") {
     const coneHollowHeight2 = beamH - R4 - (param.H1 - coneFC);
     const coneHollowR2 = R1 - param.E1 - Math.tan(coneAngle) * coneHollowHeight2;
     const ctrConeHollow = contour7(0, beamH - R4).addSegStrokeA(coneHollowR2, beamH - R4).addSegStrokeA(R1 - param.E1, param.H1 - coneFC).addSegStrokeA(R1 - param.E1, param.H1 - param.H3).addSegStrokeA(0, param.H1 - param.H3).closeSegStroke();
-    const ctrDoor = contour7(doorLowX, param.H1 + param.H6).addCornerRounded(param.R9).addSegStrokeA(doorHighX, param.H1 + param.H6 + param.H7).addCornerRounded(param.R9).addSegStrokeA(-doorHighX, param.H1 + param.H6 + param.H7).addCornerRounded(param.R9).addSegStrokeA(-doorLowX, param.H1 + param.H6).addCornerRounded(param.R9).closeSegStroke();
+    const ctrDoor = ctrTrapezoid(
+      -doorLowX,
+      param.H1 + param.H6,
+      param.L9,
+      2 * doorHighX,
+      param.H7,
+      param.R9
+    );
     figCone.addMain(ctrCone(1));
     figCone.addSecond(ctrConePlus(1));
     figCone.addSecond(ctrConePlus(-1));
@@ -3538,7 +3552,7 @@ import {
   prefixLog as prefixLog4,
   contourCircle as contourCircle8,
   ctrRectangle as ctrRectangle3,
-  ctrRectRot as ctrRectRot2,
+  ctrRectRot2,
   figure as figure9,
   radToDeg as radToDeg7,
   ffix as ffix11,
@@ -3828,14 +3842,8 @@ function pGeom9(t, param, suffix = "") {
     const stp3A = Math.atan2(stopper3Ly, S2s);
     rGeome.logstr += `stopper-rod: L ${ffix11(stp3L)} mm, A ${ffix11(radToDeg7(stp3A))} degree
 `;
-    const stp3posdX = S1r * Math.sin(stp3A);
-    const stp3posdY = S1r * Math.cos(stp3A);
-    const stp3posY = stopper3H - stp3posdY;
-    figStopperSide.addSecond(ctrRectRot2(stp3posdX, stp3posY, stp3L, param.S1, stp3A));
-    const stp3posdX2 = S1hr * Math.sin(stp3A);
-    const stp3posdY2 = S1hr * Math.cos(stp3A);
-    const stp3posY2 = stopper3H - stp3posdY2;
-    figStopperSide.addSecond(ctrRectRot2(stp3posdX2, stp3posY2, stp3L, S1h, stp3A));
+    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(contourCircle8(0, stopper3H, param.JD3 / 2));

package/package.json

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