geometrix 0.5.39 → 0.5.41

package/dist/index.d.ts

@@ -296,6 +296,7 @@ declare abstract class AContour {
     abstract toPax(): tPaxContour;
     abstract getPerimeter(): number;
 }
+declare function midArcPoint(px1: number, py1: number, seg: Segment1): Point;
 /**
  * class `Contour`
  *
@@ -674,4 +675,4 @@ declare function version_details(appPackage: tPackage): string[];
 
 declare function checkImpPages(pages: tAllPageDef): [boolean, string];
 
-export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustInit, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, ctrOblong, ctrRectRot, ctrRectRot2, ctrRectangle, ctrTrapezoid, ctrTrapezoidRot2, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tExtrude, type tFigures, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tOuterInner, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxFace, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tT3dMatrix, type tVec3, type tVec4, type tVolume, tolerance, transform3d, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };
+export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustInit, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, ctrOblong, ctrRectRot, ctrRectRot2, ctrRectangle, ctrTrapezoid, ctrTrapezoidRot2, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, midArcPoint, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tExtrude, type tFigures, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tOuterInner, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxFace, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tT3dMatrix, type tVec3, type tVec4, type tVolume, tolerance, transform3d, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };

package/dist/index.js

@@ -1673,6 +1673,17 @@ function paxPath() {
 // src/contour.ts
 var AContour = class {
 };
+function midArcPoint(px1, py1, seg) {
+  const seg2 = arcSeg1To2(px1, py1, seg);
+  const p3 = point(seg2.pc.cx, seg2.pc.cy);
+  const a12h = withinPiPi((seg2.a2 - seg2.a1) / 2);
+  let a3 = seg2.a1 + a12h;
+  if (Math.sign(a12h) > 0 && !seg.arcCcw || Math.sign(a12h) < 0 && seg.arcCcw) {
+    a3 += Math.PI;
+  }
+  const p4 = p3.translatePolar(a3, seg.radius);
+  return p4;
+}
 var Contour = class _Contour extends AContour {
   /** @internal */
   circle = false;
@@ -2213,14 +2224,7 @@ var Contour = class _Contour extends AContour {
     for (const seg of this.segments) {
       if (seg.sType === 1 /* eArc */) {
         try {
-          const seg2 = arcSeg1To2(px1, py1, seg);
-          const p3 = point(seg2.pc.cx, seg2.pc.cy);
-          const a12h = withinPiPi((seg2.a2 - seg2.a1) / 2);
-          let a3 = seg2.a1 + a12h;
-          if (Math.sign(a12h) > 0 && !seg.arcCcw || Math.sign(a12h) < 0 && seg.arcCcw) {
-            a3 += Math.PI;
-          }
-          const p4 = p3.translatePolar(a3, seg.radius);
+          const p4 = midArcPoint(px1, py1, seg);
           rPoints.push(p4);
         } catch (emsg) {
           console.log("err453: " + emsg);
@@ -3101,6 +3105,17 @@ function convTypePaxToSeg1(paxType) {
   }
   return rType;
 }
+function convPaxToSeg1(seg) {
+  const rSeg1 = new Segment1(
+    convTypePaxToSeg1(seg.typ),
+    seg.px,
+    seg.py,
+    seg.radius,
+    seg.large,
+    seg.ccw
+  );
+  return rSeg1;
+}
 
 // src/arc_to_stroke.ts
 function calcAngleStep(max_angle, max_length, radius, arc_angle) {
@@ -3665,159 +3680,194 @@ function ojscadWrite() {
 }
 
 // src/write_freecad.ts
-var approxMaxAngle3 = Math.PI / 8;
-var approxMaxLength3 = 20;
-function oscadSegLine2(p2x, p2y) {
-  const rSeg = [[p2x, p2y]];
-  return rSeg;
+function ff6(ifloat) {
+  return ifloat.toFixed(4);
 }
-function oscadSegArc2(cx, cy, radius, aa1, aa2, arcCcw) {
-  const rSeg = arc_to_stroke(cx, cy, radius, aa1, aa2, arcCcw, approxMaxAngle3, approxMaxLength3);
-  return rSeg;
+function fid(iIdx) {
+  return iIdx.toString().padStart(3, "0");
 }
-function oscadSegCircle2(cx, cy, radius) {
-  const rSeg = circle_to_stroke(cx, cy, radius, approxMaxAngle3, approxMaxLength3);
-  return rSeg;
+function fcFaceCircle(cx, cy, radius, outName) {
+  const rStr = `def ${outName}():
+	# Radius, XYZ-position, orientation
+	aCircle = Part.makeCircle(${ff6(radius)}, App.Vector(${ff6(cx)}, ${ff6(cy)}, 0), App.Vector(0, 0, 1))
+	aWire = Part.Wire(aCircle)
+	rFace = Part.Face(aWire)
+	return rFace
+
+`;
+  return rStr;
 }
-function toOpenscadSeg2(paxCtr) {
-  const rOscadSeg = [];
+function fcFaceContour(paxCtr, outName) {
+  let rStr = `def ${outName}():
+`;
   let px1 = 0;
   let py1 = 0;
+  let pIdx = 0;
+  let sIdx = 0;
   for (const seg of paxCtr) {
     if (seg.typ === 0 /* eStart */) {
-      rOscadSeg.push(...oscadSegLine2(seg.px, seg.py));
+      rStr += `	P${fid(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
+`;
+      pIdx += 1;
     } else if (seg.typ === 1 /* eStroke */) {
-      rOscadSeg.push(...oscadSegLine2(seg.px, seg.py));
+      rStr += `	P${fid(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
+`;
+      rStr += `	S${fid(sIdx)} = Part.LineSegment(P${fid(pIdx - 1)}, P${fid(pIdx)})
+`;
+      pIdx += 1;
+      sIdx += 1;
     } else if (seg.typ === 2 /* eArc */) {
       try {
-        const sega = seg;
-        const seg1 = new Segment1(
-          convTypePaxToSeg1(sega.typ),
-          sega.px,
-          sega.py,
-          sega.radius,
-          sega.large,
-          sega.ccw
-        );
-        const seg2 = arcSeg1To2(px1, py1, seg1);
-        rOscadSeg.push(
-          ...oscadSegArc2(
-            seg2.pc.cx,
-            seg2.pc.cy,
-            seg1.radius,
-            seg2.a1,
-            seg2.a2,
-            seg2.arcCcw
-          )
-        );
+        const seg1 = convPaxToSeg1(seg);
+        const p4 = midArcPoint(px1, py1, seg1);
+        rStr += `	P${fid(pIdx)} = App.Vector(${ff6(p4.cx)}, ${ff6(p4.cy)}, 0)
+`;
+        pIdx += 1;
       } catch (emsg) {
         console.log("err730: " + emsg);
       }
+      rStr += `	P${fid(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
+`;
+      rStr += `	S${fid(sIdx)} = Part.Arc(P${fid(pIdx - 2)}, P${fid(pIdx - 1)}, P${fid(pIdx)})
+`;
+      pIdx += 1;
+      sIdx += 1;
     }
     px1 = seg.px;
     py1 = seg.py;
   }
-  return rOscadSeg;
-}
-function ff6(ifloat) {
-  return ifloat.toFixed(4);
+  const segList = Array.from({ length: sIdx }, (v, i) => `S${fid(i)}`);
+  rStr += `	aShape = Part.Shape([${segList.join(", ")}])
+	aWire = Part.Wire(aShape.Edges)
+	subFace = Part.Face(aWire)
+	subFace.check()
+	return subFace
+
+`;
+  return rStr;
 }
-var OpenscadWriteFigure2 = class {
-  pts;
-  ptIdx;
-  idx;
-  constructor() {
-    this.pts = [];
-    this.ptIdx = [];
-    this.idx = 0;
+function fcOneFace(ctrNames, outName) {
+  let rStr = `def ${outName}():
+`;
+  const ctrShorts = [];
+  for (const [idx, ctr] of ctrNames.entries()) {
+    const short = `FC${fid(idx)}`;
+    rStr += `	${short} = ${ctr}()
+`;
+    ctrShorts.push(short);
   }
-  addContour(ictr) {
-    const pts2 = [];
-    const ptIdx2 = [];
-    for (const pt of ictr) {
-      const [px, py] = pt;
-      pts2.push(`[ ${ff6(px)}, ${ff6(py)} ]`);
-      ptIdx2.push(` ${this.idx}`);
-      this.idx += 1;
-    }
-    const ptStr = `[ ${pts2.join(",")} ]`;
-    const ptIdxStr = `[ ${ptIdx2.join(",")} ]`;
-    this.pts.push(ptStr);
-    this.ptIdx.push(ptIdxStr);
+  const outer = ctrShorts[0];
+  const inner = ctrShorts.slice(1);
+  if (inner.length > 0) {
+    rStr += `	rOneFace = ${outer}.cut([${inner.join(", ")}])
+`;
+  } else {
+    rStr += `	rOneFace = ${outer}
+`;
   }
-  getFigure(faceId) {
-    let rStr = "";
-    const aList = [];
-    const bList = [];
-    for (const idx of this.pts.keys()) {
-      const aId = `ca_${faceId}_${idx}`;
-      const bId = `cb_${faceId}_${idx}`;
-      rStr += `${aId} = ${this.pts[idx]};
+  rStr += `	rOneFace.check()
+	return rOneFace
+
 `;
-      rStr += `${bId} = ${this.ptIdx[idx]};
+  return rStr;
+}
+function fcOneFig(faceNames, outName) {
+  let rStr = `def ${outName}():
 `;
-      aList.push(aId);
-      bList.push(bId);
-    }
-    const aListStr = aList.join(", ");
-    const bListStr = bList.join(", ");
-    rStr += `a_${faceId} = concat(${aListStr});
+  const faceShorts = [];
+  for (const [idx, face] of faceNames.entries()) {
+    const short = `FA${fid(idx)}`;
+    rStr += `	${short} = ${face}()
 `;
-    rStr += `b_${faceId} = [${bListStr}];
+    faceShorts.push(short);
+  }
+  const firstFace = faceShorts[0];
+  const otherFace = faceShorts.slice(1);
+  if (otherFace.length > 0) {
+    rStr += `	rOneFig = ${firstFace}.fuse([${otherFace.join(", ")}])
+`;
+  } else {
+    rStr += `	rOneFig = ${firstFace}
 `;
-    return rStr;
   }
-};
+  rStr += `	rOneFig.check()
+	return rOneFig
+
+`;
+  return rStr;
+}
 var FreecadWrite = class {
   //constructor() {}
-  getHeader() {
-    const rStr = "// Generated by Parametrix\n";
+  getHeader(outFileName) {
+    const rStr = `# freecad-python generated by Parametrix
+# run the script with:
+# freecad.cmd myScript.py
+
+import FreeCAD as App
+import Part
+
+#print(sys.argv)
+outFileName = "${outFileName}"
+if (len(sys.argv) == 3):
+    outFileName = sys.argv[2]
+print(f"outFileName: {outFileName}")
+
+`;
     return rStr;
   }
-  getOneFigure(aFaces, faceId) {
-    const oscadWF = new OpenscadWriteFigure2();
-    for (const paxFace of aFaces) {
-      for (const paxCtr of paxFace) {
+  getOneFigure(aFaces, figName) {
+    let rStr = "";
+    const figFaceList = [];
+    for (const [faceIdx, paxFace] of aFaces.entries()) {
+      const faceName = `face_${figName}_Fa${faceIdx}`;
+      const faceCtrList = [];
+      for (const [ctrIdx, paxCtr] of paxFace.entries()) {
+        const subFaceName = `ctr_${faceName}_Ctr${ctrIdx}`;
         if (paxCtr.circle === true) {
           const paxCircle2 = paxCtr;
-          const oscadSeg = oscadSegCircle2(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
-          oscadWF.addContour(oscadSeg);
+          rStr += fcFaceCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius, subFaceName);
         } else {
           const paxPath2 = paxCtr;
-          const oscadSeg = toOpenscadSeg2(paxPath2.seg);
-          oscadWF.addContour(oscadSeg);
+          rStr += fcFaceContour(paxPath2.seg, subFaceName);
         }
+        faceCtrList.push(subFaceName);
       }
+      rStr += fcOneFace(faceCtrList, faceName);
+      figFaceList.push(faceName);
     }
-    const rOscadF = oscadWF.getFigure(faceId);
-    return rOscadF;
+    rStr += fcOneFig(figFaceList, figName);
+    return rStr;
   }
-  getAllFigures(faces, partName) {
+  getAllFigures(figs, partName) {
     let rStr = "";
-    for (const face in faces) {
-      const figu = this.getOneFigure(faces[face], `${partName}_${face}`);
+    for (const ifig in figs) {
+      const figu = this.getOneFigure(figs[ifig], `${partName}_${ifig}`);
       rStr += figu;
     }
     return rStr;
   }
   getOneExtrude(extrud) {
-    let extrudMethod = "rotate_extrude";
-    let extrudOption = "";
+    let rStr = `def fex_${extrud.outName}():
+	FIG = ${extrud.face}()
+`;
     if (extrud.extrudeMethod === 0 /* eLinearOrtho */) {
       if (extrud.length === void 0) {
-        console.log("err103: design error: scad-linear_extrude length undefined!");
+        console.log(
+          `err103: ${extrud.face} ${extrud.outName} design error: eLinearOrtho length undefined!`
+        );
       }
-      extrudMethod = "linear_extrude";
-      extrudOption = `height = ${extrud.length}`;
-    }
-    const rStr = `
-module ${extrud.outName} () {
-	translate( [ ${extrud.translate[0]}, ${extrud.translate[1]}, ${extrud.translate[2]} ])
-		rotate( [ ${radToDeg(extrud.rotate[0])}, ${radToDeg(extrud.rotate[1])}, ${radToDeg(
-      extrud.rotate[2]
-    )} ])
-			   ${extrudMethod}(${extrudOption}) polygon(a_${extrud.face}, b_${extrud.face});
-}
+      rStr += `	VEX = FIG.extrude(App.Vector(0, 0, ${extrud.length}))`;
+    } else if (extrud.extrudeMethod === 1 /* eRotate */) {
+      rStr += `	VEX = FIG.revolve(App.Vector(0, 0, 0), App.Vector(0, 1, 0), 360).rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), 90)`;
+    }
+    rStr += `
+	VR1 = VEX.rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), ${radToDeg(extrud.rotate[0])})
+	VR2 = VR1.rotate(App.Vector(0, 0, 0), App.Vector(0, 1, 0), ${radToDeg(extrud.rotate[1])})
+	VR3 = VR2.rotate(App.Vector(0, 0, 0), App.Vector(0, 0, 1), ${radToDeg(extrud.rotate[2])})
+	VFP = VR3.translate(App.Vector(${extrud.translate[0]}, ${extrud.translate[1]}, ${extrud.translate[2]}))
+	return VFP
+${extrud.outName} = fex_${extrud.outName}()
+
 `;
     return rStr;
   }
@@ -3830,36 +3880,33 @@ module ${extrud.outName} () {
     return rStr;
   }
   getOneVolume(volum) {
-    let vMethod = "identity";
-    switch (volum.boolMethod) {
-      case 1 /* eIntersection */:
-        vMethod = "intersection";
-        break;
-      case 2 /* eUnion */:
-        vMethod = "union";
-        break;
-      case 3 /* eSubstraction */:
-        vMethod = "difference";
-        break;
-    }
-    const inList2 = [];
-    for (const elem of volum.inList) {
-      inList2.push(`${elem}();`);
-    }
-    const inList3 = inList2.join("\n");
-    let rStr = `
-module ${volum.outName} () {
-	${vMethod} () {
-		${inList3}
-	}
-}
+    let rStr = "";
+    if (volum.inList.length === 0) {
+      console.log(`err215: ${volum.outName} has an empty inList`);
+    } else if (volum.inList.length === 1) {
+      rStr += `${volum.outName} = ${volum.inList[0]}
 `;
-    if (volum.boolMethod === 0 /* eIdentity */) {
-      rStr = `
-module ${volum.outName} () {
-	${inList3}
-}
+    } else {
+      const firstV = volum.inList[0];
+      const othersV = volum.inList.slice(1);
+      switch (volum.boolMethod) {
+        case 0 /* eIdentity */:
+          rStr += `${volum.outName} = ${firstV}
+`;
+          break;
+        case 1 /* eIntersection */:
+          rStr += `${volum.outName} = ${firstV}.common([${othersV.join(", ")}])
 `;
+          break;
+        case 2 /* eUnion */:
+          rStr += `${volum.outName} = ${firstV}.fuse([${othersV.join(", ")}])
+`;
+          break;
+        case 3 /* eSubstraction */:
+          rStr += `${volum.outName} = ${firstV}.cut([${othersV.join(", ")}])
+`;
+          break;
+      }
     }
     return rStr;
   }
@@ -3882,13 +3929,11 @@ module ${volum.outName} () {
   }
   getOneInherit(inherit) {
     const rStr = `
-module ${inherit.outName} () {
-	translate( [ ${inherit.translate[0]}, ${inherit.translate[1]}, ${inherit.translate[2]} ])
-		rotate( [ ${radToDeg(inherit.rotate[0])}, ${radToDeg(inherit.rotate[1])}, ${radToDeg(
-      inherit.rotate[2]
-    )} ])
-			   ${inherit.subdesign}();
-}
+IVR1_${inherit.subdesign} = ${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), ${radToDeg(inherit.rotate[0])})
+IVR2_${inherit.subdesign} = IVR1_${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(0, 1, 0), ${radToDeg(inherit.rotate[1])})
+IVR3_${inherit.subdesign} = IVR2_${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(0, 0, 1), ${radToDeg(inherit.rotate[2])})
+${inherit.outName} = IVR3_${inherit.subdesign}.translate(App.Vector(${inherit.translate[0]}, ${inherit.translate[1]}, ${inherit.translate[2]}))
+
 `;
     return rStr;
   }
@@ -3917,12 +3962,17 @@ module ${inherit.outName} () {
   }
   getFooter(partName) {
     const rStr = `
-pax_${partName}();
+pax_${partName}.check()
+#pax_${partName}.exportBrep(f"{outFileName}.brep")
+#pax_${partName}.exportIges(f"{outFileName}.igs")
+#pax_${partName}.exportStep(f"{outFileName}.stp")
+pax_${partName}.exportStl(f"{outFileName}.stl")
+
 `;
     return rStr;
   }
   getExportFile(pax) {
-    let rStr = this.getHeader();
+    let rStr = this.getHeader(pax.partName);
     rStr += this.getAllFigures(pax.figures, pax.partName);
     rStr += this.getVolume(pax.volume);
     rStr += this.getFooter(pax.partName);
@@ -4596,6 +4646,7 @@ export {
   linePP,
   makeCorner,
   mergeFaces,
+  midArcPoint,
   oneDesignParam,
   orientedArc,
   pCheckbox,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.39",
+	"version": "0.5.41",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -67,15 +67,15 @@
 		"json5": "^2.2.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.13.0",
+		"@types/node": "^20.14.0",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.1.0",
 		"npm-run-all": "^4.1.5",
-		"prettier": "^3.2.5",
+		"prettier": "^3.3.0",
 		"shx": "^0.3.4",
-		"tsup": "^8.0.2",
+		"tsup": "^8.1.0",
 		"typescript": "^5.4.5",
 		"vitest": "^1.6.0"
 	}