geometrix 0.5.53 → 0.5.55

package/dist/index.d.ts

@@ -29,11 +29,13 @@ declare function canvas2point(cx: number, cy: number, iAdjust: tCanvasAdjust): [
 declare function canvasTranslatePolar(cx: number, cy: number, ia: number, il: number): [number, number];
 declare function radius2canvas(iRadius: number, iAdjust: tCanvasAdjust): number;
 declare function adjustZero(): tCanvasAdjust;
+declare function adjustCopy(iAdjust: tCanvasAdjust): tCanvasAdjust;
 declare function adjustInit(xMin: number, xMax: number, yMin: number, yMax: number, cWidth: number, cHeight: number): tCanvasAdjust;
 declare function adjustCenter(px: number, py: number, iAdjust: tCanvasAdjust): tCanvasAdjust;
 declare function adjustRect(p1x: number, p1y: number, p2x: number, p2y: number, cWidth: number, cHeight: number): tCanvasAdjust;
 declare function adjustScale(iFactor: number, iAdjust: tCanvasAdjust): tCanvasAdjust;
 declare function adjustTranslate(p1x: number, p1y: number, p2x: number, p2y: number, iAdjust: tCanvasAdjust): tCanvasAdjust;
+declare function adjustMini(widthOrig: number, widthTarget: number, iAdjust: tCanvasAdjust): tCanvasAdjust;
 
 declare const tolerance: number;
 declare function degToRad(degrees: number): number;
@@ -638,8 +640,8 @@ type tT3dMatrix = [tVec4, tVec4, tVec4, tVec4];
 declare class Transform3d {
     mmat: tT3dMatrix;
     constructor(iMat: tT3dMatrix);
-    addRotation(ax: number, ay: number, az: number): void;
-    addTranslation(ax: number, ay: number, az: number): void;
+    addRotation(ax: number, ay: number, az: number): Transform3d;
+    addTranslation(ax: number, ay: number, az: number): Transform3d;
     getMatrix(): tT3dMatrix;
     getRotation(): tVec3;
     getTranslation(): tVec3;
@@ -685,4 +687,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, midArcPoint, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointCoord, 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, adjustCopy, adjustInit, adjustMini, 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, pointCoord, 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

@@ -87,6 +87,7 @@ var colors = {
   reference: "blue",
   mouse: "yellow"
 };
+var c_margin = 0.05;
 function point2canvas(px, py, iAdjust) {
   const cx2 = iAdjust.shiftX + (px - iAdjust.xMin) * iAdjust.scaleX;
   const cy2 = iAdjust.shiftY + (py - iAdjust.yMin) * iAdjust.scaleY;
@@ -128,6 +129,19 @@ function adjustZero() {
   };
   return rAdjustZero;
 }
+function adjustCopy(iAdjust) {
+  const rAdjustZero = {
+    init: iAdjust.init,
+    xMin: iAdjust.xMin,
+    yMin: iAdjust.yMin,
+    xyDiff: iAdjust.xyDiff,
+    shiftX: iAdjust.shiftX,
+    shiftY: iAdjust.shiftY,
+    scaleX: iAdjust.scaleX,
+    scaleY: iAdjust.scaleY
+  };
+  return rAdjustZero;
+}
 function adjustInit(xMin, xMax, yMin, yMax, cWidth, cHeight) {
   const rAdjust = adjustZero();
   const xDiff = Math.max(xMax - xMin, 1);
@@ -144,14 +158,14 @@ function adjustInit(xMin, xMax, yMin, yMax, cWidth, cHeight) {
   rAdjust.xMin = xMin;
   rAdjust.yMin = yMin;
   rAdjust.xyDiff = xyDiff;
-  rAdjust.shiftX = 0.05 * cWidth;
+  rAdjust.shiftX = c_margin * cWidth;
   rAdjust.scaleX = xyScale;
-  rAdjust.shiftY = cHeight - 0.05 * cHeight;
+  rAdjust.shiftY = cHeight - c_margin * cHeight;
   rAdjust.scaleY = -1 * xyScale;
   return rAdjust;
 }
 function adjustCenter(px, py, iAdjust) {
-  const rAdjust = structuredClone(iAdjust);
+  const rAdjust = adjustCopy(iAdjust);
   rAdjust.xMin = px - rAdjust.xyDiff / 2;
   rAdjust.yMin = py - rAdjust.xyDiff / 2;
   return rAdjust;
@@ -165,7 +179,7 @@ function adjustRect(p1x, p1y, p2x, p2y, cWidth, cHeight) {
   return rAdjust;
 }
 function adjustScale(iFactor, iAdjust) {
-  const rAdjust = structuredClone(iAdjust);
+  const rAdjust = adjustCopy(iAdjust);
   const shift = (1 - iFactor) / 2;
   rAdjust.xMin += shift * iAdjust.xyDiff;
   rAdjust.yMin += shift * iAdjust.xyDiff;
@@ -175,13 +189,25 @@ function adjustScale(iFactor, iAdjust) {
   return rAdjust;
 }
 function adjustTranslate(p1x, p1y, p2x, p2y, iAdjust) {
-  const rAdjust = structuredClone(iAdjust);
+  const rAdjust = adjustCopy(iAdjust);
   const xDiff = p2x - p1x;
   const yDiff = p2y - p1y;
   rAdjust.xMin += -xDiff;
   rAdjust.yMin += -yDiff;
   return rAdjust;
 }
+function adjustMini(widthOrig, widthTarget, iAdjust) {
+  const rAdjust = adjustCopy(iAdjust);
+  if (widthOrig > 0 && widthTarget > 0) {
+    const mf = widthOrig / widthTarget;
+    rAdjust.xyDiff *= mf;
+    rAdjust.scaleX *= 1 / mf;
+    rAdjust.scaleY *= 1 / mf;
+    rAdjust.shiftX += c_margin * widthTarget - c_margin * widthOrig;
+    rAdjust.shiftY += (1 - c_margin) * widthTarget - (1 - c_margin) * widthOrig;
+  }
+  return rAdjust;
+}
 
 // src/triangle_utils.ts
 function rightTriLaFromLbLc(ilb, ilc) {
@@ -4526,10 +4552,12 @@ var Transform3d = class {
   addRotation(ax, ay, az) {
     const mR = t3dRotate(ax, ay, az);
     this.mmat = t3dCombine([this.mmat, mR]);
+    return this;
   }
   addTranslation(ax, ay, az) {
     const mT = t3dTranslate(ax, ay, az);
     this.mmat = t3dCombine([this.mmat, mT]);
+    return this;
   }
   getMatrix() {
     return this.mmat;
@@ -4650,7 +4678,9 @@ export {
   aCFromAaAb,
   aCFromLaLbLc,
   adjustCenter,
+  adjustCopy,
   adjustInit,
+  adjustMini,
   adjustRect,
   adjustScale,
   adjustTranslate,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.53",
+	"version": "0.5.55",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -63,21 +63,21 @@
 		"clean": "rimraf dist node_modules"
 	},
 	"dependencies": {
-		"@zip.js/zip.js": "^2.7.52",
+		"@zip.js/zip.js": "^2.7.53",
 		"json5": "^2.2.3"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.10.0",
 		"@types/eslint__js": "^8.42.3",
-		"@types/node": "^22.7.8",
-		"eslint": "^9.13.0",
+		"@types/node": "^22.9.0",
+		"eslint": "^9.14.0",
 		"eslint-config-prettier": "^9.1.0",
-		"npm-run-all2": "^7.0.0",
+		"npm-run-all2": "^7.0.1",
 		"prettier": "^3.3.3",
 		"rimraf": "^6.0.1",
-		"tsup": "^8.3.0",
+		"tsup": "^8.3.5",
 		"typescript": "^5.6.3",
-		"typescript-eslint": "^8.11.0",
-		"vitest": "^2.1.3"
+		"typescript-eslint": "^8.14.0",
+		"vitest": "^2.1.5"
 	}
 }