geometrix 0.5.29 → 0.5.31

package/dist/index.d.ts

@@ -615,8 +615,30 @@ declare class Transform3d {
 }
 declare function transform3d(initM?: tT3dMatrix): Transform3d;
 
+/**
+ * The rectangle-origin is bottom-left.
+ */
 declare function ctrRectangle(ox: number, oy: number, width: number, height: number, cornerRounded?: number): tContour;
+/**
+ * The rectangle-origin is bottom-left.
+ */
 declare function ctrRectRot(ox: number, oy: number, width: number, height: number, angle: number, cornerRounded?: number): tContour;
+/**
+ * The rectangle-origin is middle-left.
+ */
+declare function ctrRectRot2(ox: number, oy: number, width: number, height: number, angle: number, cornerRounded?: number): tContour;
+/**
+ * The trapezoid-origin is bottom-left.
+ */
+declare function ctrTrapezoid(ox: number, oy: number, bottomWidth: number, topWidth: number, height: number, cornerRounded?: number): tContour;
+/**
+ * The trapezoid-origin is middle-left.
+ */
+declare function ctrTrapezoidRot2(ox: number, oy: number, leftSide: number, rightSide: number, Hlength: number, angle: number, cornerRounded?: number): tContour;
+/**
+ * The oblong-origin is middle-left.
+ */
+declare function ctrOblong(ox: number, oy: number, Vwidth: number, Hlength: number, angle: number): tContour;
 
 /** For cli-app and ui-app */
 type tDependencies = Record<string, string>;
@@ -631,4 +653,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, ctrRectRot, ctrRectangle, 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 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 };

package/dist/index.js

@@ -100,7 +100,13 @@ function radius2canvas(iRadius, iAdjust) {
   if (roundZero(iAdjust.scaleX - Math.abs(iAdjust.scaleY)) !== 0) {
     throw `err683: iAdjust.scaleX and scaleY differ ${iAdjust.scaleX} ${iAdjust.scaleY}`;
   }
+  if (iAdjust.scaleX < 0) {
+    throw `err684: iAdjust.scaleX ${iAdjust.scaleX} is negative`;
+  }
   const rRadius = iRadius * iAdjust.scaleX;
+  if (rRadius < 0) {
+    throw `err685: rRadius for canvas ${rRadius} is negative`;
+  }
   return rRadius;
 }
 function adjustZero() {
@@ -2334,6 +2340,9 @@ var ContourCircle = class _ContourCircle extends AContour {
     this.py = iy;
     this.radius = iRadius;
     this.imposedColor = icolor;
+    if (iRadius < 0) {
+      throw `err432: iRadius ${iRadius} is negative at circle ix ${ix}, iy ${iy}`;
+    }
   }
   /** @internal */
   clone() {
@@ -4059,6 +4068,35 @@ function ctrRectRot(ox, oy, width, height, angle, cornerRounded = 0) {
   const rCtr = ctrRectangle(ox, oy, width, height, cornerRounded).rotate(ox, oy, angle);
   return rCtr;
 }
+function ctrRectRot2(ox, oy, width, height, angle, cornerRounded = 0) {
+  const dpx = height / 2 * Math.sin(angle);
+  const dpy = -height / 2 * Math.cos(angle);
+  const rCtr = ctrRectRot(ox + dpx, oy + dpy, width, height, angle, cornerRounded);
+  return rCtr;
+}
+function ctrTrapezoid(ox, oy, bottomWidth, topWidth, height, cornerRounded = 0) {
+  const dw2 = (topWidth - bottomWidth) / 2;
+  const rCtr = contour(ox, oy).addCornerRounded(cornerRounded).addSegStrokeR(bottomWidth, 0).addCornerRounded(cornerRounded).addSegStrokeR(dw2, height).addCornerRounded(cornerRounded).addSegStrokeR(-topWidth, 0).addCornerRounded(cornerRounded).closeSegStroke();
+  return rCtr;
+}
+function ctrTrapezoidRot2(ox, oy, leftSide, rightSide, Hlength, angle, cornerRounded = 0) {
+  const dw2 = (rightSide - leftSide) / 2;
+  const dpx = leftSide / 2 * Math.sin(angle);
+  const dpy = leftSide / 2 * Math.cos(angle);
+  const ctr1 = contour(ox, oy).addCornerRounded(cornerRounded).addSegStrokeR(0, -leftSide).addCornerRounded(cornerRounded).addSegStrokeR(-dw2, Hlength).addCornerRounded(cornerRounded).addSegStrokeR(0, rightSide).addCornerRounded(cornerRounded).closeSegStroke();
+  const rCtr = ctr1.rotate(ox, oy, angle).translate(-dpx, dpy);
+  return rCtr;
+}
+function ctrOblong(ox, oy, Vwidth, Hlength, angle) {
+  if (Hlength < Vwidth) {
+    throw `err821: Hlength ${Hlength} is too small compare to Vwidth ${Vwidth}`;
+  }
+  const dpy = Vwidth / 2;
+  const dpx = Hlength - Vwidth;
+  const ctr1 = contour(dpy + dpx, -dpy).addPointA(dpy + dpx, dpy).addSegArc(dpy, false, true).addSegStrokeA(dpy, dpy).addPointA(dpy, -dpy).addSegArc(dpy, false, true).closeSegStroke();
+  const rCtr = ctr1.rotate(0, 0, angle).translate(ox, oy);
+  return rCtr;
+}
 
 // src/version_details.ts
 function version_details(appPackage) {
@@ -4137,8 +4175,12 @@ export {
   contourCircle,
   copyLayers,
   createParamFile,
+  ctrOblong,
   ctrRectRot,
+  ctrRectRot2,
   ctrRectangle,
+  ctrTrapezoid,
+  ctrTrapezoidRot2,
   degToRad,
   designParam,
   dxfSegArc,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.29",
+	"version": "0.5.31",
 	"description": "The 2D geometry engine of the parametrix",
 	"type": "module",
 	"private": false,