calculate-packing 0.0.38 → 0.0.40

package/dist/index.d.ts

@@ -56,6 +56,12 @@ type PackPlacementStrategy = "shortest_connection_along_outline" | "minimum_sum_
 interface PackInput {
     components: InputComponent[];
     obstacles?: InputObstacle[];
+    bounds?: {
+        minX: number;
+        minY: number;
+        maxX: number;
+        maxY: number;
+    };
     minGap: number;
     packOrderStrategy: "largest_to_smallest";
     packPlacementStrategy: PackPlacementStrategy;
@@ -352,6 +358,7 @@ declare class OutlineSegmentCandidatePointSolver extends BaseSolver {
     packedComponents: PackedComponent[];
     componentToPack: InputComponent;
     viableBounds?: Bounds;
+    globalBounds?: Bounds;
     optimalPosition?: Point$2;
     irlsSolver?: MultiOffsetIrlsSolver;
     twoPhaseIrlsSolver?: TwoPhaseIrlsSolver;
@@ -364,6 +371,7 @@ declare class OutlineSegmentCandidatePointSolver extends BaseSolver {
         packedComponents: PackedComponent[];
         componentToPack: InputComponent;
         obstacles?: InputObstacle[];
+        globalBounds?: Bounds;
     });
     getConstructorParams(): ConstructorParameters<typeof OutlineSegmentCandidatePointSolver>[0];
     _getOutlineBoundsWithMargin(params?: {
@@ -440,12 +448,14 @@ declare class SingleComponentPackSolver extends BaseSolver {
     }>;
     bestCandidate?: CandidateResult;
     outputPackedComponent?: PackedComponent;
+    bounds?: Bounds;
     constructor(params: {
         componentToPack: InputComponent;
         packedComponents: PackedComponent[];
         packPlacementStrategy: PackPlacementStrategy;
         minGap?: number;
         obstacles?: InputObstacle[];
+        bounds?: Bounds;
     });
     _setup(): void;
     _step(): void;
@@ -465,6 +475,7 @@ declare class SingleComponentPackSolver extends BaseSolver {
         packPlacementStrategy: PackPlacementStrategy;
         minGap: number;
         obstacles: InputObstacle[];
+        bounds: Bounds | undefined;
     };
 }
 

package/dist/index.js

@@ -1416,6 +1416,7 @@ var OutlineSegmentCandidatePointSolver = class extends BaseSolver {
   packedComponents;
   componentToPack;
   viableBounds;
+  globalBounds;
   optimalPosition;
   irlsSolver;
   twoPhaseIrlsSolver;
@@ -1429,6 +1430,7 @@ var OutlineSegmentCandidatePointSolver = class extends BaseSolver {
     this.packedComponents = params.packedComponents;
     this.componentToPack = params.componentToPack;
     this.obstacles = params.obstacles ?? [];
+    this.globalBounds = params.globalBounds;
   }
   getConstructorParams() {
     return {
@@ -1439,7 +1441,8 @@ var OutlineSegmentCandidatePointSolver = class extends BaseSolver {
       minGap: this.minGap,
       packedComponents: this.packedComponents,
       componentToPack: this.componentToPack,
-      obstacles: this.obstacles
+      obstacles: this.obstacles,
+      globalBounds: this.globalBounds
     };
   }
   _getOutlineBoundsWithMargin(params = {}) {
@@ -1731,6 +1734,19 @@ var OutlineSegmentCandidatePointSolver = class extends BaseSolver {
         });
       }
     }
+    if (this.globalBounds) {
+      graphics.lines.push({
+        points: [
+          { x: this.globalBounds.minX, y: this.globalBounds.minY },
+          { x: this.globalBounds.minX, y: this.globalBounds.maxY },
+          { x: this.globalBounds.maxX, y: this.globalBounds.maxY },
+          { x: this.globalBounds.maxX, y: this.globalBounds.minY },
+          { x: this.globalBounds.minX, y: this.globalBounds.minY }
+        ],
+        strokeColor: "rgba(255,0,255,0.5)",
+        strokeDash: "2 2"
+      });
+    }
     if (this.viableBounds) {
       graphics.rects.push({
         center: {
@@ -1962,6 +1978,7 @@ var SingleComponentPackSolver = class extends BaseSolver {
   rejectedCandidates = [];
   bestCandidate;
   outputPackedComponent;
+  bounds;
   constructor(params) {
     super();
     this.componentToPack = params.componentToPack;
@@ -1969,6 +1986,7 @@ var SingleComponentPackSolver = class extends BaseSolver {
     this.packPlacementStrategy = params.packPlacementStrategy;
     this.minGap = params.minGap ?? 0;
     this.obstacles = params.obstacles ?? [];
+    this.bounds = params.bounds;
   }
   _setup() {
     super._setup();
@@ -2138,7 +2156,8 @@ var SingleComponentPackSolver = class extends BaseSolver {
         minGap: this.minGap,
         packedComponents: this.packedComponents,
         componentToPack: this.componentToPack,
-        obstacles: this.obstacles
+        obstacles: this.obstacles,
+        globalBounds: this.bounds
       });
       this.activeSubSolver.setup();
       break;
@@ -2224,6 +2243,19 @@ var SingleComponentPackSolver = class extends BaseSolver {
         });
       }
     }
+    if (this.bounds) {
+      graphics.lines.push({
+        points: [
+          { x: this.bounds.minX, y: this.bounds.minY },
+          { x: this.bounds.minX, y: this.bounds.maxY },
+          { x: this.bounds.maxX, y: this.bounds.maxY },
+          { x: this.bounds.maxX, y: this.bounds.minY },
+          { x: this.bounds.minX, y: this.bounds.minY }
+        ],
+        strokeColor: "rgba(0,0,0,0.5)",
+        strokeDash: "2 2"
+      });
+    }
     switch (this.currentPhase) {
       case "outline":
         this.visualizeOutlinePhase(graphics);
@@ -2330,7 +2362,8 @@ gap_distance=${candidate.gapDistance}`,
       packedComponents: this.packedComponents,
       packPlacementStrategy: this.packPlacementStrategy,
       minGap: this.minGap,
-      obstacles: this.obstacles
+      obstacles: this.obstacles,
+      bounds: this.bounds
     };
   }
 };
@@ -2396,7 +2429,8 @@ var PackSolver2 = class extends BaseSolver {
       componentToPack: firstComponentToPack,
       packPlacementStrategy: this.packInput.packPlacementStrategy,
       minGap: this.packInput.minGap,
-      obstacles
+      obstacles,
+      bounds: this.packInput.bounds
     });
     fallbackSolver.solve();
     const result = fallbackSolver.getResult();
@@ -2431,7 +2465,8 @@ var PackSolver2 = class extends BaseSolver {
         componentToPack: this.componentToPack,
         packPlacementStrategy: this.packInput.packPlacementStrategy,
         minGap: this.packInput.minGap,
-        obstacles: this.packInput.obstacles ?? []
+        obstacles: this.packInput.obstacles ?? [],
+        bounds: this.packInput.bounds
       });
       this.activeSubSolver.setup();
     }
@@ -2486,6 +2521,19 @@ var PackSolver2 = class extends BaseSolver {
         });
       }
     }
+    if (this.packInput.bounds) {
+      graphics.lines.push({
+        points: [
+          { x: this.packInput.bounds.minX, y: this.packInput.bounds.minY },
+          { x: this.packInput.bounds.minX, y: this.packInput.bounds.maxY },
+          { x: this.packInput.bounds.maxX, y: this.packInput.bounds.maxY },
+          { x: this.packInput.bounds.maxX, y: this.packInput.bounds.minY },
+          { x: this.packInput.bounds.minX, y: this.packInput.bounds.minY }
+        ],
+        strokeColor: "rgba(0,0,0,0.5)",
+        strokeDash: "2 2"
+      });
+    }
     if (this.packedComponents.length === 0) {
       for (const component of this.unpackedComponentQueue) {
         for (const pad of component.pads) {
@@ -2620,8 +2668,11 @@ var extractPadInfos = (pcbComponent, db, getNetworkId) => {
         });
         break;
       }
+      default: {
+        console.warn(`Unsupported plated hole shape ${ph.shape}`);
+        break;
+      }
     }
-    console.warn(`Unsupported plated hole shape ${ph.shape}`);
   }
   for (const sp of db.pcb_smtpad.list({
     pcb_component_id: pcbComponent.pcb_component_id

package/package.json

@@ -2,7 +2,7 @@
   "name": "calculate-packing",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "Calculate a packing layout with support for different strategy configurations",
   "scripts": {
     "start": "cosmos",