geometrix 0.5.37 → 0.5.39

package/dist/index.d.ts

@@ -3,7 +3,8 @@ declare const colors: {
     line: string;
     vector: string;
     contour: string;
-    main: string;
+    mainOuter: string;
+    mainInner: string;
     mainB: string;
     second: string;
     secondB: string;
@@ -269,6 +270,7 @@ interface tPaxContourPath {
     seg: tPaxSeg[];
 }
 type tPaxContour = tPaxContourPath | tPaxContourCircle;
+type tPaxFace = tPaxContour[];
 declare function paxCircle(cx: number, cy: number, radius: number): tPaxContourCircle;
 declare class PaxPath {
     seg: tPaxSeg[];
@@ -403,11 +405,15 @@ interface tLayers {
     ruler: boolean;
     refframe: boolean;
 }
+/**
+ * The face-type is a list of contours. The first contour is the outer, the remaining are the inner contours
+ */
+type tOuterInner = tContour[];
 declare class Figure {
     pointList: Point[];
     lineList: Line[];
     vectorList: Vector[];
-    mainList: tContour[];
+    mainList: tOuterInner[];
     mainBList: tContour[];
     secondList: tContour[];
     secondBList: tContour[];
@@ -422,13 +428,23 @@ declare class Figure {
     addLine(iline: Line): void;
     addLines(ilines: Line[]): void;
     addVector(ivector: Vector): void;
-    addMain(icontour: tContour): void;
+    /**
+     * add one Outer contour and several Inner contours to the Main Layer
+     * @param {tOuterInner} iFace - the Face (i.e one Outer and several Inner contours) to be added
+     */
+    addMainOI(iFace: tOuterInner): void;
+    /**
+     * add one Outer contour to the Main Layer
+     * @param {tContour} iFace - the Face (without inner contours) to be added
+     */
+    addMainO(iFace: tContour): void;
     addSecond(icontour: tContour): void;
     addDynamics(icontour: tContour): void;
     translate(ix: number, iy: number): Figure;
     translatePolar(ia: number, il: number): Figure;
     rotate(ix: number, iy: number, ia: number): Figure;
     mergeFigure(ifig: Figure, mainToSecond?: boolean): void;
+    mainListC(): tContour[];
     clear(): void;
     /** @internal */
     getMinMax(): void;
@@ -440,9 +456,9 @@ declare class Figure {
     draw(ctx: CanvasRenderingContext2D, adjust: tCanvasAdjust, layers: tLayers): void;
 }
 declare function figure(): Figure;
-type tFaces = Record<string, Figure>;
+type tFigures = Record<string, Figure>;
 /** For cli-app and ui-app */
-declare function mergeFaces(iFaces: tFaces): Figure;
+declare function mergeFaces(iFigures: tFigures): Figure;
 declare function initLayers(): tLayers;
 declare function copyLayers(iLayers: tLayers): tLayers;
 
@@ -508,7 +524,7 @@ declare class DesignParam {
 declare function designParam(iparamDef: tParamDef, suffix?: string): DesignParam;
 declare function pNumber(name: string, unit: string, init: number, min?: number, max?: number, step?: number): tParam;
 declare function pCheckbox(name: string, init: boolean): tParam;
-declare function pDropdown(name: string, values: string[]): tParam;
+declare function pDropdown(name: string, values: string[], iInit?: number): tParam;
 declare function pSectionSeparator(name: string): tParam;
 
 type tPosiOrien = [number, number, number];
@@ -524,7 +540,7 @@ interface tGeom {
     partName: string;
     calcErr: boolean;
     logstr: string;
-    fig: tFaces;
+    fig: tFigures;
     vol: tVolume;
     sub: tSubDesign;
 }
@@ -587,7 +603,8 @@ declare enum EFormat {
     ePAX = 5,
     eOPENSCAD = 6,
     eJSCAD = 7,
-    eZIP = 8
+    eFREECAD = 8,
+    eZIP = 9
 }
 declare function fileTextContent(fgeom: tGeomFunc, paramVal: tParamVal, ipDef: tParamDef, eFace: string, exportFormat: EFormat): string;
 declare function fileBinContent(fgeom: tGeomFunc, tSim: number, paramVal: tParamVal, ipDef: tParamDef, exportFormat: EFormat): Promise<Blob>;
@@ -657,4 +674,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 tFaces, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, 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, 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

@@ -71,7 +71,8 @@ var colors = {
   line: "grey",
   vector: "DarkTurquoise",
   contour: "green",
-  main: "SteelBlue",
+  mainOuter: "SlateBlue",
+  mainInner: "SteelBlue",
   mainB: "SlateGrey",
   second: "Violet",
   secondB: "SlateGrey",
@@ -2493,12 +2494,28 @@ var Figure = class _Figure {
   addVector(ivector) {
     this.vectorList.push(ivector);
   }
-  addMain(icontour) {
-    const roundedContour = icontour.generateContour();
-    this.addPoints(roundedContour.generatePoints());
-    this.addLines(roundedContour.generateLines());
-    this.mainList.push(roundedContour);
-    this.mainBList.push(icontour.extractSkeleton());
+  /**
+   * add one Outer contour and several Inner contours to the Main Layer
+   * @param {tOuterInner} iFace - the Face (i.e one Outer and several Inner contours) to be added
+   */
+  addMainOI(iFace) {
+    const oneFace = [];
+    for (const oneCtr of iFace) {
+      const roundedContour = oneCtr.generateContour();
+      this.addPoints(roundedContour.generatePoints());
+      this.addLines(roundedContour.generateLines());
+      oneFace.push(roundedContour);
+      this.mainBList.push(oneCtr.extractSkeleton());
+    }
+    this.mainList.push(oneFace);
+  }
+  /**
+   * add one Outer contour to the Main Layer
+   * @param {tContour} iFace - the Face (without inner contours) to be added
+   */
+  addMainO(iFace) {
+    const face = [iFace];
+    this.addMainOI(face);
   }
   addSecond(icontour) {
     const roundedContour = icontour.generateContour();
@@ -2523,8 +2540,12 @@ var Figure = class _Figure {
     for (const vec of this.vectorList) {
       rfig.addVector(vec.translate(ix, iy));
     }
-    for (const ctr of this.mainList) {
-      rfig.addMain(ctr.translate(ix, iy));
+    for (const face of this.mainList) {
+      const oneFace = [];
+      for (const ctr of face) {
+        oneFace.push(ctr.translate(ix, iy));
+      }
+      rfig.addMainOI(oneFace);
     }
     for (const ctr of this.secondList) {
       rfig.addSecond(ctr.translate(ix, iy));
@@ -2549,8 +2570,12 @@ var Figure = class _Figure {
     for (const vec of this.vectorList) {
       rfig.addVector(vec.rotate(pt0, ia));
     }
-    for (const ctr of this.mainList) {
-      rfig.addMain(ctr.rotate(ix, iy, ia));
+    for (const face of this.mainList) {
+      const oneFace = [];
+      for (const ctr of face) {
+        oneFace.push(ctr.rotate(ix, iy, ia));
+      }
+      rfig.addMainOI(oneFace);
     }
     for (const ctr of this.secondList) {
       rfig.addSecond(ctr.rotate(ix, iy, ia));
@@ -2570,11 +2595,17 @@ var Figure = class _Figure {
     for (const vec of ifig.vectorList) {
       this.addVector(vec.clone());
     }
-    for (const ctr of ifig.mainList) {
+    for (const face of ifig.mainList) {
+      const oneFace = [];
+      for (const ctr of face) {
+        oneFace.push(ctr.clone());
+      }
       if (mainToSecond) {
-        this.addSecond(ctr.clone());
+        for (const ctr of oneFace) {
+          this.addSecond(ctr);
+        }
       } else {
-        this.addMain(ctr.clone());
+        this.addMainOI(oneFace);
       }
     }
     for (const ctr of ifig.secondList) {
@@ -2584,6 +2615,15 @@ var Figure = class _Figure {
       this.addDynamics(ctr.clone());
     }
   }
+  mainListC() {
+    const rListC = [];
+    for (const face of this.mainList) {
+      for (const ctr of face) {
+        rListC.push(ctr);
+      }
+    }
+    return rListC;
+  }
   clear() {
     this.pointList = [];
     this.lineList = [];
@@ -2676,8 +2716,14 @@ var Figure = class _Figure {
       }
     }
     if (layers.main) {
-      for (const li of this.mainList) {
-        li.draw(ctx, adjust, colors.main);
+      for (const face of this.mainList) {
+        for (const [idx, li] of face.entries()) {
+          let ctrColor = colors.mainOuter;
+          if (idx > 0) {
+            ctrColor = colors.mainInner;
+          }
+          li.draw(ctx, adjust, ctrColor);
+        }
       }
     }
     if (layers.mainB) {
@@ -2717,10 +2763,10 @@ var Figure = class _Figure {
 function figure() {
   return new Figure();
 }
-function mergeFaces(iFaces) {
+function mergeFaces(iFigures) {
   const rfig = figure();
-  for (const face in iFaces) {
-    const fig = iFaces[face];
+  for (const ifig in iFigures) {
+    const fig = iFigures[ifig];
     for (const ipoint of fig.pointList) {
       rfig.pointList.push(ipoint);
     }
@@ -2730,8 +2776,8 @@ function mergeFaces(iFaces) {
     for (const ivector of fig.vectorList) {
       rfig.vectorList.push(ivector);
     }
-    for (const ctr of fig.mainList) {
-      rfig.mainList.push(ctr);
+    for (const face of fig.mainList) {
+      rfig.mainList.push(face);
     }
     for (const ctr of fig.mainBList) {
       rfig.mainBList.push(ctr);
@@ -2923,11 +2969,15 @@ function pCheckbox(name, init) {
   };
   return rParam;
 }
-function pDropdown(name, values) {
+function pDropdown(name, values, iInit = 0) {
+  let init = 0;
+  if (iInit < values.length) {
+    init = iInit;
+  }
   const rParam = {
     name,
     unit: "dropdown",
-    init: 0,
+    init,
     min: 0,
     max: values.length - 1,
     step: 1,
@@ -3001,10 +3051,14 @@ function prefixLog(iLog, iPartName) {
 // src/write_pax.ts
 var PaxWrite = class {
   //constructor() {}
-  figureToPaxF(aCtr) {
+  figureToPaxF(aFaces) {
     const rPaxF = [];
-    for (const ctr of aCtr) {
-      rPaxF.push(ctr.toPax());
+    for (const face of aFaces) {
+      const oneFace = [];
+      for (const ctr of face) {
+        oneFace.push(ctr.toPax());
+      }
+      rPaxF.push(oneFace);
     }
     return rPaxF;
   }
@@ -3021,7 +3075,7 @@ var PaxWrite = class {
       partName: geome0.partName,
       pDef: ipDef,
       params: paramVal,
-      faces: this.getFigures(geome0.fig),
+      figures: this.getFigures(geome0.fig),
       volume: geome0.vol,
       subs: geome0.sub,
       log: geome0.logstr
@@ -3197,26 +3251,28 @@ var OpenscadWrite = class {
     const rStr = "// Generated by Parametrix\n";
     return rStr;
   }
-  getOneFigure(aCtr, faceId) {
+  getOneFigure(aFaces, faceId) {
     const oscadWF = new OpenscadWriteFigure();
-    for (const paxCtr of aCtr) {
-      if (paxCtr.circle === true) {
-        const paxCircle2 = paxCtr;
-        const oscadSeg = oscadSegCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
-        oscadWF.addContour(oscadSeg);
-      } else {
-        const paxPath2 = paxCtr;
-        const oscadSeg = toOpenscadSeg(paxPath2.seg);
-        oscadWF.addContour(oscadSeg);
+    for (const paxFace of aFaces) {
+      for (const paxCtr of paxFace) {
+        if (paxCtr.circle === true) {
+          const paxCircle2 = paxCtr;
+          const oscadSeg = oscadSegCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
+          oscadWF.addContour(oscadSeg);
+        } else {
+          const paxPath2 = paxCtr;
+          const oscadSeg = toOpenscadSeg(paxPath2.seg);
+          oscadWF.addContour(oscadSeg);
+        }
       }
     }
     const rOscadF = oscadWF.getFigure(faceId);
     return rOscadF;
   }
-  getAllFigures(faces, partName) {
+  getAllFigures(figures, partName) {
     let rStr = "";
-    for (const face in faces) {
-      const figu = this.getOneFigure(faces[face], `${partName}_${face}`);
+    for (const face in figures) {
+      const figu = this.getOneFigure(figures[face], `${partName}_${face}`);
       rStr += figu;
     }
     return rStr;
@@ -3327,7 +3383,7 @@ module ${inherit.outName} () {
       const subGeoms = this.getAllSubGeoms(vol.inherits);
       for (const oneGeom of subGeoms) {
         const paxJson = paxWrite().getPaxJson({}, oneGeom, zeroPDef);
-        rStr += this.getAllFigures(paxJson.faces, paxJson.partName);
+        rStr += this.getAllFigures(paxJson.figures, paxJson.partName);
         rStr += this.getVolume(oneGeom.vol);
       }
       rStr += this.getAllInherits(vol.inherits);
@@ -3344,7 +3400,7 @@ pax_${partName}();
   }
   getExportFile(pax) {
     let rStr = this.getHeader();
-    rStr += this.getAllFigures(pax.faces, pax.partName);
+    rStr += this.getAllFigures(pax.figures, pax.partName);
     rStr += this.getVolume(pax.volume);
     rStr += this.getFooter(pax.partName);
     return rStr;
@@ -3460,17 +3516,19 @@ const main = () => {
 `;
     return rStr;
   }
-  getOneFigure(aCtr, faceId) {
+  getOneFigure(aFaces, faceId) {
     const ojscadWF = new OjscadWriteFigure();
-    for (const paxCtr of aCtr) {
-      if (paxCtr.circle === true) {
-        const paxCircle2 = paxCtr;
-        const ojscadSeg = ojscadSegCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
-        ojscadWF.addContour(ojscadSeg);
-      } else {
-        const paxPath2 = paxCtr;
-        const ojscadSeg = toOpenjscadSeg(paxPath2.seg);
-        ojscadWF.addContour(ojscadSeg);
+    for (const paxFace of aFaces) {
+      for (const paxCtr of paxFace) {
+        if (paxCtr.circle === true) {
+          const paxCircle2 = paxCtr;
+          const ojscadSeg = ojscadSegCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
+          ojscadWF.addContour(ojscadSeg);
+        } else {
+          const paxPath2 = paxCtr;
+          const ojscadSeg = toOpenjscadSeg(paxPath2.seg);
+          ojscadWF.addContour(ojscadSeg);
+        }
       }
     }
     const rOjscadF = ojscadWF.getFigure(faceId);
@@ -3576,7 +3634,7 @@ const ${inherit.outName} =
       const subGeoms = this.getAllSubGeoms(vol.inherits);
       for (const oneGeom of subGeoms) {
         const paxJson = paxWrite().getPaxJson({}, oneGeom, zeroPDef);
-        rStr += this.getAllFigures(paxJson.faces, paxJson.partName);
+        rStr += this.getAllFigures(paxJson.figures, paxJson.partName);
         rStr += this.getVolume(oneGeom.vol);
       }
       rStr += this.getAllInherits(vol.inherits);
@@ -3595,7 +3653,7 @@ module.exports = { main };
   }
   getExportFile(pax) {
     let rStr = this.getHeader();
-    rStr += this.getAllFigures(pax.faces, pax.partName);
+    rStr += this.getAllFigures(pax.figures, pax.partName);
     rStr += this.getVolume(pax.volume);
     rStr += this.getFooter(pax.partName);
     return rStr;
@@ -3606,6 +3664,276 @@ function ojscadWrite() {
   return rOjscadWrite;
 }
 
+// src/write_freecad.ts
+var approxMaxAngle3 = Math.PI / 8;
+var approxMaxLength3 = 20;
+function oscadSegLine2(p2x, p2y) {
+  const rSeg = [[p2x, p2y]];
+  return rSeg;
+}
+function oscadSegArc2(cx, cy, radius, aa1, aa2, arcCcw) {
+  const rSeg = arc_to_stroke(cx, cy, radius, aa1, aa2, arcCcw, approxMaxAngle3, approxMaxLength3);
+  return rSeg;
+}
+function oscadSegCircle2(cx, cy, radius) {
+  const rSeg = circle_to_stroke(cx, cy, radius, approxMaxAngle3, approxMaxLength3);
+  return rSeg;
+}
+function toOpenscadSeg2(paxCtr) {
+  const rOscadSeg = [];
+  let px1 = 0;
+  let py1 = 0;
+  for (const seg of paxCtr) {
+    if (seg.typ === 0 /* eStart */) {
+      rOscadSeg.push(...oscadSegLine2(seg.px, seg.py));
+    } else if (seg.typ === 1 /* eStroke */) {
+      rOscadSeg.push(...oscadSegLine2(seg.px, seg.py));
+    } 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
+          )
+        );
+      } catch (emsg) {
+        console.log("err730: " + emsg);
+      }
+    }
+    px1 = seg.px;
+    py1 = seg.py;
+  }
+  return rOscadSeg;
+}
+function ff6(ifloat) {
+  return ifloat.toFixed(4);
+}
+var OpenscadWriteFigure2 = class {
+  pts;
+  ptIdx;
+  idx;
+  constructor() {
+    this.pts = [];
+    this.ptIdx = [];
+    this.idx = 0;
+  }
+  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);
+  }
+  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 += `${bId} = ${this.ptIdx[idx]};
+`;
+      aList.push(aId);
+      bList.push(bId);
+    }
+    const aListStr = aList.join(", ");
+    const bListStr = bList.join(", ");
+    rStr += `a_${faceId} = concat(${aListStr});
+`;
+    rStr += `b_${faceId} = [${bListStr}];
+`;
+    return rStr;
+  }
+};
+var FreecadWrite = class {
+  //constructor() {}
+  getHeader() {
+    const rStr = "// Generated by Parametrix\n";
+    return rStr;
+  }
+  getOneFigure(aFaces, faceId) {
+    const oscadWF = new OpenscadWriteFigure2();
+    for (const paxFace of aFaces) {
+      for (const paxCtr of paxFace) {
+        if (paxCtr.circle === true) {
+          const paxCircle2 = paxCtr;
+          const oscadSeg = oscadSegCircle2(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
+          oscadWF.addContour(oscadSeg);
+        } else {
+          const paxPath2 = paxCtr;
+          const oscadSeg = toOpenscadSeg2(paxPath2.seg);
+          oscadWF.addContour(oscadSeg);
+        }
+      }
+    }
+    const rOscadF = oscadWF.getFigure(faceId);
+    return rOscadF;
+  }
+  getAllFigures(faces, partName) {
+    let rStr = "";
+    for (const face in faces) {
+      const figu = this.getOneFigure(faces[face], `${partName}_${face}`);
+      rStr += figu;
+    }
+    return rStr;
+  }
+  getOneExtrude(extrud) {
+    let extrudMethod = "rotate_extrude";
+    let extrudOption = "";
+    if (extrud.extrudeMethod === 0 /* eLinearOrtho */) {
+      if (extrud.length === void 0) {
+        console.log("err103: design error: scad-linear_extrude 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});
+}
+`;
+    return rStr;
+  }
+  getAllExtrudes(extrudes) {
+    let rStr = "";
+    for (const extrud of extrudes) {
+      const subp = this.getOneExtrude(extrud);
+      rStr += subp;
+    }
+    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}
+	}
+}
+`;
+    if (volum.boolMethod === 0 /* eIdentity */) {
+      rStr = `
+module ${volum.outName} () {
+	${inList3}
+}
+`;
+    }
+    return rStr;
+  }
+  getAllVolumes(volumes) {
+    let rStr = "";
+    for (const volum of volumes) {
+      const subp = this.getOneVolume(volum);
+      rStr += subp;
+    }
+    return rStr;
+  }
+  getAllSubGeoms(inherits) {
+    const rGeoms = [];
+    for (const inher of inherits) {
+      if (!rGeoms.includes(inher.subgeom)) {
+        rGeoms.push(inher.subgeom);
+      }
+    }
+    return rGeoms;
+  }
+  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}();
+}
+`;
+    return rStr;
+  }
+  getAllInherits(inherits) {
+    let rStr = "";
+    for (const inher of inherits) {
+      const subinhe = this.getOneInherit(inher);
+      rStr += subinhe;
+    }
+    return rStr;
+  }
+  getVolume(vol) {
+    let rStr = "";
+    if (vol.inherits !== void 0) {
+      const subGeoms = this.getAllSubGeoms(vol.inherits);
+      for (const oneGeom of subGeoms) {
+        const paxJson = paxWrite().getPaxJson({}, oneGeom, zeroPDef);
+        rStr += this.getAllFigures(paxJson.figures, paxJson.partName);
+        rStr += this.getVolume(oneGeom.vol);
+      }
+      rStr += this.getAllInherits(vol.inherits);
+    }
+    rStr += this.getAllExtrudes(vol.extrudes);
+    rStr += this.getAllVolumes(vol.volumes);
+    return rStr;
+  }
+  getFooter(partName) {
+    const rStr = `
+pax_${partName}();
+`;
+    return rStr;
+  }
+  getExportFile(pax) {
+    let rStr = this.getHeader();
+    rStr += this.getAllFigures(pax.figures, pax.partName);
+    rStr += this.getVolume(pax.volume);
+    rStr += this.getFooter(pax.partName);
+    return rStr;
+  }
+};
+function freecadWrite() {
+  const rFreecadWrite = new FreecadWrite();
+  return rFreecadWrite;
+}
+
 // src/aaExportContent.ts
 import * as zip from "@zip.js/zip.js";
 var MinMaxPoint = class {
@@ -3695,7 +4023,7 @@ function figureToSvg(aCtr) {
 }
 function figureToSvgDeco(fig) {
   const sw2 = svgWriter2();
-  sw2.addAContour(fig.mainList, "main", colors.main);
+  sw2.addAContour(fig.mainListC(), "main", colors.mainInner);
   sw2.addAContour(fig.mainBList, "mainB", colors.mainB);
   sw2.addAContour(fig.secondList, "second", colors.second);
   sw2.addAContour(fig.secondBList, "secondB", colors.secondB);
@@ -3741,6 +4069,11 @@ function makeOpenjscad(geome0) {
   const rStr = ojscadWrite().getExportFile(paxJson);
   return rStr;
 }
+function makeFreecad(geome0) {
+  const paxJson = paxWrite().getPaxJson({}, geome0, zeroPDef);
+  const rStr = freecadWrite().getExportFile(paxJson);
+  return rStr;
+}
 async function makeZip(paramVal, geome0, tSim, geome1, ipDef) {
   const zipFileWriter = new zip.BlobWriter("application/zip");
   const zipWriter = new zip.ZipWriter(zipFileWriter);
@@ -3752,9 +4085,9 @@ async function makeZip(paramVal, geome0, tSim, geome1, ipDef) {
   const zLog1 = new zip.TextReader(geome1.logstr);
   await zipWriter.add(`geom_${partName}_t${tSim}_log.txt`, zLog1);
   for (const face in geome0.fig) {
-    const svgOne = new zip.TextReader(figureToSvg(geome0.fig[face].mainList));
+    const svgOne = new zip.TextReader(figureToSvg(geome0.fig[face].mainListC()));
     await zipWriter.add(`face_${partName}_${face}.svg`, svgOne);
-    const dxfOne = new zip.TextReader(figureToDxf(geome0.fig[face].mainList));
+    const dxfOne = new zip.TextReader(figureToDxf(geome0.fig[face].mainListC()));
     await zipWriter.add(`face_${partName}_${face}.dxf`, dxfOne);
     const svgOneDeco = new zip.TextReader(figureToSvgDeco(geome0.fig[face]));
     await zipWriter.add(`deco_${partName}_${face}.svg`, svgOneDeco);
@@ -3762,9 +4095,9 @@ async function makeZip(paramVal, geome0, tSim, geome1, ipDef) {
     await zipWriter.add(`deco_${partName}_${face}_t${tSim}.svg`, svgOneDecoT);
   }
   const mergedFace = mergeFaces(geome0.fig);
-  const svgMerged = new zip.TextReader(figureToSvg(mergedFace.mainList));
+  const svgMerged = new zip.TextReader(figureToSvg(mergedFace.mainListC()));
   await zipWriter.add(`face_${partName}_all_merged.svg`, svgMerged);
-  const dxfMerged = new zip.TextReader(figureToDxf(mergedFace.mainList));
+  const dxfMerged = new zip.TextReader(figureToDxf(mergedFace.mainListC()));
   await zipWriter.add(`face_${partName}_all_merged.dxf`, dxfMerged);
   const svgMergedDeco = new zip.TextReader(figureToSvgDeco(mergedFace));
   await zipWriter.add(`deco_${partName}_all_merged.svg`, svgMergedDeco);
@@ -3776,6 +4109,8 @@ async function makeZip(paramVal, geome0, tSim, geome1, ipDef) {
   await zipWriter.add(`${partName}_noarc_openscad.scad`, zSCad);
   const zJScad = new zip.TextReader(makeOpenjscad(geome0));
   await zipWriter.add(`${partName}_noarc_jscad.js`, zJScad);
+  const zFreecad = new zip.TextReader(makeFreecad(geome0));
+  await zipWriter.add(`${partName}_freecad.py`, zFreecad);
   await zipWriter.close();
   const rFileContent = await zipFileWriter.getData();
   return rFileContent;
@@ -3791,7 +4126,8 @@ var EFormat = /* @__PURE__ */ ((EFormat2) => {
   EFormat2[EFormat2["ePAX"] = 5] = "ePAX";
   EFormat2[EFormat2["eOPENSCAD"] = 6] = "eOPENSCAD";
   EFormat2[EFormat2["eJSCAD"] = 7] = "eJSCAD";
-  EFormat2[EFormat2["eZIP"] = 8] = "eZIP";
+  EFormat2[EFormat2["eFREECAD"] = 8] = "eFREECAD";
+  EFormat2[EFormat2["eZIP"] = 9] = "eZIP";
   return EFormat2;
 })(EFormat || {});
 function fileTextContent(fgeom, paramVal, ipDef, eFace, exportFormat) {
@@ -3802,23 +4138,23 @@ function fileTextContent(fgeom, paramVal, ipDef, eFace, exportFormat) {
     if (exportFormat === 0 /* eSVG */) {
       if (figList.includes(eFace)) {
         const figu = geome0.fig[eFace];
-        rFileContent = figureToSvg(figu.mainList);
+        rFileContent = figureToSvg(figu.mainListC());
       } else {
         console.log(`err749: fileTextContent eFace ${eFace} invalid`);
       }
     } else if (exportFormat === 1 /* eSVGALL */) {
       const figu = mergeFaces(geome0.fig);
-      rFileContent = figureToSvg(figu.mainList);
+      rFileContent = figureToSvg(figu.mainListC());
     } else if (exportFormat === 2 /* eDXF */) {
       if (figList.includes(eFace)) {
         const figu = geome0.fig[eFace];
-        rFileContent = figureToDxf(figu.mainList);
+        rFileContent = figureToDxf(figu.mainListC());
       } else {
         console.log(`err759: fileTextContent eFace ${eFace} invalid`);
       }
     } else if (exportFormat === 3 /* eDXFALL */) {
       const figu = mergeFaces(geome0.fig);
-      rFileContent = figureToDxf(figu.mainList);
+      rFileContent = figureToDxf(figu.mainListC());
     } else if (exportFormat === 4 /* eTXTLOG */) {
       rFileContent = makeLog(geome0);
     } else if (exportFormat === 5 /* ePAX */) {
@@ -3827,6 +4163,8 @@ function fileTextContent(fgeom, paramVal, ipDef, eFace, exportFormat) {
       rFileContent = makeOpenscad(geome0);
     } else if (exportFormat === 7 /* eJSCAD */) {
       rFileContent = makeOpenjscad(geome0);
+    } else if (exportFormat === 8 /* eFREECAD */) {
+      rFileContent = makeFreecad(geome0);
     } else {
       console.log(`err912: unknown exportFormat ${exportFormat}`);
     }
@@ -3840,7 +4178,7 @@ async function fileBinContent(fgeom, tSim, paramVal, ipDef, exportFormat) {
   const geome1 = fgeom(tSim, paramVal);
   let rFileContent = new Blob();
   if (!geome0.calcErr && !geome1.calcErr) {
-    if (exportFormat === 8 /* eZIP */) {
+    if (exportFormat === 9 /* eZIP */) {
       rFileContent = await makeZip(paramVal, geome0, tSim, geome1, ipDef);
     } else {
       console.log(`err913: unknown exportFormat ${exportFormat}`);
@@ -3864,7 +4202,9 @@ function fileMime(exportFormat) {
     rMime = "text/plain";
   } else if (exportFormat === 7 /* eJSCAD */) {
     rMime = "text/plain";
-  } else if (exportFormat === 8 /* eZIP */) {
+  } else if (exportFormat === 8 /* eFREECAD */) {
+    rMime = "text/plain";
+  } else if (exportFormat === 9 /* eZIP */) {
     rMime = "application/zip";
   }
   return rMime;
@@ -3883,14 +4223,16 @@ function fileSuffix(exportFormat) {
     rSuffix = "_noarc_openscad.scad";
   } else if (exportFormat === 7 /* eJSCAD */) {
     rSuffix = "_noarc_jscad.js";
-  } else if (exportFormat === 8 /* eZIP */) {
+  } else if (exportFormat === 8 /* eFREECAD */) {
+    rSuffix = "_freecad.py";
+  } else if (exportFormat === 9 /* eZIP */) {
     rSuffix = ".zip";
   }
   return rSuffix;
 }
 function fileBin(exportFormat) {
   let rBin = false;
-  if (exportFormat === 8 /* eZIP */) {
+  if (exportFormat === 9 /* eZIP */) {
     rBin = true;
   }
   return rBin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.37",
+	"version": "0.5.39",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -63,11 +63,11 @@
 		"clean": "shx rm -fr dist node_modules"
 	},
 	"dependencies": {
-		"@zip.js/zip.js": "^2.7.44",
+		"@zip.js/zip.js": "^2.7.45",
 		"json5": "^2.2.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.12.11",
+		"@types/node": "^20.13.0",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.57.0",