copperflow 0.3.2 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +39 -0
- package/dist/app/assets/{NewPartDialog-Qb7NwhBb.js → NewPartDialog-C4sKWnGI.js} +38 -38
- package/dist/app/assets/index-BgzJedaB.css +1 -0
- package/dist/app/assets/index-C_U9me2P.js +19 -0
- package/dist/app/index.html +2 -2
- package/dist/cli-commands.d.ts +3 -0
- package/dist/cli-commands.js +74 -8
- package/dist/cli-commands.js.map +1 -1
- package/dist/cli-library.d.ts +5 -0
- package/dist/cli-library.js +58 -0
- package/dist/cli-library.js.map +1 -0
- package/dist/cli-modules.d.ts +6 -0
- package/dist/cli-modules.js +33 -0
- package/dist/cli-modules.js.map +1 -0
- package/dist/cli-studio.d.ts +1 -0
- package/dist/cli-studio.js +27 -0
- package/dist/cli-studio.js.map +1 -0
- package/dist/core/board-import.d.ts +39 -0
- package/dist/core/board-import.js +114 -0
- package/dist/core/board-import.js.map +1 -0
- package/dist/core/board-shape-edit.d.ts +13 -0
- package/dist/core/board-shape-edit.js +134 -0
- package/dist/core/board-shape-edit.js.map +1 -0
- package/dist/core/edit.js +9 -3
- package/dist/core/edit.js.map +1 -1
- package/dist/core/fabrication.d.ts +6 -0
- package/dist/core/fabrication.js +1 -1
- package/dist/core/fabrication.js.map +1 -1
- package/dist/core/git.d.ts +16 -0
- package/dist/core/git.js +51 -0
- package/dist/core/git.js.map +1 -0
- package/dist/core/home.d.ts +2 -0
- package/dist/core/home.js +10 -0
- package/dist/core/home.js.map +1 -0
- package/dist/core/index.d.ts +2 -0
- package/dist/core/index.js +2 -0
- package/dist/core/index.js.map +1 -1
- package/dist/core/instance-copper.d.ts +25 -0
- package/dist/core/instance-copper.js +142 -0
- package/dist/core/instance-copper.js.map +1 -0
- package/dist/core/instance-move.d.ts +23 -0
- package/dist/core/instance-move.js +59 -0
- package/dist/core/instance-move.js.map +1 -0
- package/dist/core/instance-requests.d.ts +3 -2
- package/dist/core/instance-requests.js +17 -3
- package/dist/core/instance-requests.js.map +1 -1
- package/dist/core/library-modules.d.ts +29 -0
- package/dist/core/library-modules.js +324 -0
- package/dist/core/library-modules.js.map +1 -0
- package/dist/core/library-sources.d.ts +33 -0
- package/dist/core/library-sources.js +179 -0
- package/dist/core/library-sources.js.map +1 -0
- package/dist/core/modules.d.ts +44 -0
- package/dist/core/modules.js +284 -0
- package/dist/core/modules.js.map +1 -0
- package/dist/core/new-circuit-sheets.d.ts +11 -2
- package/dist/core/new-circuit-sheets.js +35 -6
- package/dist/core/new-circuit-sheets.js.map +1 -1
- package/dist/core/placement-write.d.ts +2 -0
- package/dist/core/placement-write.js +12 -6
- package/dist/core/placement-write.js.map +1 -1
- package/dist/core/plain-sheet.d.ts +12 -0
- package/dist/core/plain-sheet.js +169 -0
- package/dist/core/plain-sheet.js.map +1 -0
- package/dist/core/render.d.ts +45 -0
- package/dist/core/render.js +57 -0
- package/dist/core/render.js.map +1 -0
- package/dist/core/sheet-card.d.ts +33 -0
- package/dist/core/sheet-card.js +118 -0
- package/dist/core/sheet-card.js.map +1 -0
- package/dist/core/types.d.ts +20 -0
- package/dist/core/workspace.d.ts +4 -0
- package/dist/core/workspace.js +13 -2
- package/dist/core/workspace.js.map +1 -1
- package/dist/engine/checks/drc-parts.js +7 -7
- package/dist/engine/checks/drc-parts.js.map +1 -1
- package/dist/engine/checks/erc.js +35 -3
- package/dist/engine/checks/erc.js.map +1 -1
- package/dist/engine/component.d.ts +2 -0
- package/dist/engine/component.js +18 -1
- package/dist/engine/component.js.map +1 -1
- package/dist/engine/dxf/board.d.ts +42 -0
- package/dist/engine/dxf/board.js +218 -0
- package/dist/engine/dxf/board.js.map +1 -0
- package/dist/engine/dxf/index.d.ts +2 -0
- package/dist/engine/dxf/index.js +3 -0
- package/dist/engine/dxf/index.js.map +1 -0
- package/dist/engine/dxf/reader.d.ts +43 -0
- package/dist/engine/dxf/reader.js +142 -0
- package/dist/engine/dxf/reader.js.map +1 -0
- package/dist/engine/elaborate.js +14 -4
- package/dist/engine/elaborate.js.map +1 -1
- package/dist/engine/fab/designator-places.d.ts +101 -0
- package/dist/engine/fab/designator-places.js +259 -0
- package/dist/engine/fab/designator-places.js.map +1 -0
- package/dist/engine/fab/designators.d.ts +26 -14
- package/dist/engine/fab/designators.js +320 -70
- package/dist/engine/fab/designators.js.map +1 -1
- package/dist/engine/fab/layers.js +6 -6
- package/dist/engine/fab/layers.js.map +1 -1
- package/dist/engine/fab/stroke-font.d.ts +2 -2
- package/dist/engine/fab/stroke-font.js +7 -6
- package/dist/engine/fab/stroke-font.js.map +1 -1
- package/dist/engine/footprints/file.d.ts +33 -0
- package/dist/engine/footprints/file.js +13 -5
- package/dist/engine/footprints/file.js.map +1 -1
- package/dist/engine/model.d.ts +15 -1
- package/dist/engine/model.js.map +1 -1
- package/dist/engine/pcb-place/block-board.d.ts +9 -0
- package/dist/engine/pcb-place/block-board.js +256 -0
- package/dist/engine/pcb-place/block-board.js.map +1 -0
- package/dist/engine/pcb-place/blocks.d.ts +31 -6
- package/dist/engine/pcb-place/blocks.js +37 -8
- package/dist/engine/pcb-place/blocks.js.map +1 -1
- package/dist/engine/pcb-place/constructive.d.ts +3 -2
- package/dist/engine/pcb-place/constructive.js +14 -2
- package/dist/engine/pcb-place/constructive.js.map +1 -1
- package/dist/engine/pcb-place/index.d.ts +8 -0
- package/dist/engine/pcb-place/index.js +7 -0
- package/dist/engine/pcb-place/index.js.map +1 -1
- package/dist/engine/pcb-place/scope.js +6 -1
- package/dist/engine/pcb-place/scope.js.map +1 -1
- package/dist/engine/pcb.d.ts +6 -0
- package/dist/engine/pcb.js +12 -1
- package/dist/engine/pcb.js.map +1 -1
- package/dist/engine/router/replicate.js +4 -0
- package/dist/engine/router/replicate.js.map +1 -1
- package/dist/engine/router/route-board.d.ts +2 -0
- package/dist/engine/router/route-board.js +27 -1
- package/dist/engine/router/route-board.js.map +1 -1
- package/dist/engine/sheet-ports.d.ts +17 -1
- package/dist/engine/sheet-ports.js +38 -1
- package/dist/engine/sheet-ports.js.map +1 -1
- package/dist/mcp/batch.d.ts +2 -2
- package/dist/mcp/batch.js +12 -12
- package/dist/mcp/batch.js.map +1 -1
- package/dist/mcp/board-import-tool.d.ts +25 -0
- package/dist/mcp/board-import-tool.js +25 -0
- package/dist/mcp/board-import-tool.js.map +1 -0
- package/dist/mcp/board-summary.d.ts +1 -1
- package/dist/mcp/board-summary.js +1 -1
- package/dist/mcp/board-summary.js.map +1 -1
- package/dist/mcp/compact.js +17 -5
- package/dist/mcp/compact.js.map +1 -1
- package/dist/mcp/copper-tools.d.ts +4 -4
- package/dist/mcp/copper-tools.js +19 -19
- package/dist/mcp/copper-tools.js.map +1 -1
- package/dist/mcp/create-part.d.ts +4 -4
- package/dist/mcp/create-part.js +12 -10
- package/dist/mcp/create-part.js.map +1 -1
- package/dist/mcp/datasheet-tools.d.ts +1 -1
- package/dist/mcp/datasheet-tools.js +4 -4
- package/dist/mcp/datasheet-tools.js.map +1 -1
- package/dist/mcp/fillet-tools.d.ts +2 -2
- package/dist/mcp/fillet-tools.js +6 -6
- package/dist/mcp/fillet-tools.js.map +1 -1
- package/dist/mcp/guide.d.ts +1 -1
- package/dist/mcp/guide.js +4 -3
- package/dist/mcp/guide.js.map +1 -1
- package/dist/mcp/import-part.d.ts +1 -1
- package/dist/mcp/import-part.js +4 -4
- package/dist/mcp/import-part.js.map +1 -1
- package/dist/mcp/make-sheet.d.ts +1 -1
- package/dist/mcp/make-sheet.js +6 -6
- package/dist/mcp/make-sheet.js.map +1 -1
- package/dist/mcp/module-tools.d.ts +4 -0
- package/dist/mcp/module-tools.js +21 -0
- package/dist/mcp/module-tools.js.map +1 -0
- package/dist/mcp/new-circuit.d.ts +13 -2
- package/dist/mcp/new-circuit.js +30 -28
- package/dist/mcp/new-circuit.js.map +1 -1
- package/dist/mcp/open-studio.d.ts +30 -0
- package/dist/mcp/open-studio.js +97 -0
- package/dist/mcp/open-studio.js.map +1 -0
- package/dist/mcp/place-tools.d.ts +2 -2
- package/dist/mcp/place-tools.js +14 -11
- package/dist/mcp/place-tools.js.map +1 -1
- package/dist/mcp/pour-tools.d.ts +4 -4
- package/dist/mcp/pour-tools.js +18 -18
- package/dist/mcp/pour-tools.js.map +1 -1
- package/dist/mcp/project-tools.d.ts +3 -3
- package/dist/mcp/project-tools.js +8 -8
- package/dist/mcp/project-tools.js.map +1 -1
- package/dist/mcp/render-tool.d.ts +30 -0
- package/dist/mcp/render-tool.js +33 -0
- package/dist/mcp/render-tool.js.map +1 -0
- package/dist/mcp/route-tools.d.ts +2 -2
- package/dist/mcp/route-tools.js +10 -10
- package/dist/mcp/route-tools.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -0
- package/dist/mcp/server.js +49 -31
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/sheet-card-tools.d.ts +28 -0
- package/dist/mcp/sheet-card-tools.js +45 -0
- package/dist/mcp/sheet-card-tools.js.map +1 -0
- package/dist/render/render.js +2060 -0
- package/dist/studio/idle.d.ts +7 -0
- package/dist/studio/idle.js +34 -0
- package/dist/studio/idle.js.map +1 -0
- package/dist/studio/place-runner.js +1 -1
- package/dist/studio/place-runner.js.map +1 -1
- package/dist/studio/run-studio.d.ts +21 -0
- package/dist/studio/run-studio.js +68 -0
- package/dist/studio/run-studio.js.map +1 -0
- package/dist/studio/server.d.ts +5 -0
- package/dist/studio/server.js +24 -2
- package/dist/studio/server.js.map +1 -1
- package/dist/studio/studio-control.d.ts +6 -0
- package/dist/studio/studio-control.js +14 -0
- package/dist/studio/studio-control.js.map +1 -0
- package/dist/studio/studio-note.d.ts +33 -0
- package/dist/studio/studio-note.js +130 -0
- package/dist/studio/studio-note.js.map +1 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/library/modules/CanNode/CanNode.sheet.tsx +65 -0
- package/library/modules/CanNode/module.json +4 -0
- package/library/modules/CanNode/parts/MCP2515-I-SO/MCP2515_I_SO.tsx +10 -0
- package/library/modules/CanNode/parts/MCP2515-I-SO/part.yaml +64 -0
- package/library/modules/CanNode/parts/MCP2515-I-SO/verification.md +42 -0
- package/library/modules/CanNode/parts/TJA1051T-3/TJA1051T_3.tsx +10 -0
- package/library/modules/CanNode/parts/TJA1051T-3/part.yaml +34 -0
- package/library/modules/CanNode/parts/TJA1051T-3/verification.md +28 -0
- package/library/modules/DigitalInput24V/DigitalInput24V.sheet.tsx +24 -0
- package/library/modules/DigitalInput24V/module.json +4 -0
- package/library/modules/RelayDriver/RelayDriver.sheet.tsx +39 -0
- package/library/modules/RelayDriver/module.json +4 -0
- package/library/modules/RelayDriver/parts/AO3400A/AO3400A.tsx +11 -0
- package/library/modules/RelayDriver/parts/AO3400A/part.yaml +21 -0
- package/library/modules/RelayDriver/parts/AO3400A/verification.md +24 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/SRD_12VDC_SL_C.tsx +11 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/footprint.yaml +70 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/part.yaml +31 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/verification.md +37 -0
- package/package.json +6 -2
- package/skills/copperflow/SKILL.md +20 -20
- package/skills/copperflow/references/copper.md +83 -6
- package/skills/copperflow/references/modules.md +80 -0
- package/skills/copperflow/references/planning.md +55 -11
- package/skills/copperflow/references/writing-circuits.md +29 -3
- package/skills/copperflow-plan/SKILL.md +7 -4
- package/dist/app/assets/index-CSWIIMFE.css +0 -1
- package/dist/app/assets/index-C_TXwo-N.js +0 -19
|
@@ -32,6 +32,39 @@ export declare const FootprintFileSchema: z.ZodObject<{
|
|
|
32
32
|
body: z.ZodOptional<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>>>;
|
|
33
33
|
placeholder: z.ZodOptional<z.ZodBoolean>;
|
|
34
34
|
}, z.core.$strict>;
|
|
35
|
+
/**
|
|
36
|
+
* The same land pattern for a tool's input: a point is a list of exactly two numbers, not a pair type. A pair's JSON
|
|
37
|
+
* schema writes `items` as a list, and a client that reads schemas as JSON Schema 2020-12 drops the whole tool for it.
|
|
38
|
+
* Parse what arrives with FootprintFileSchema to get the pairs.
|
|
39
|
+
*/
|
|
40
|
+
export declare const FootprintFileInputSchema: z.ZodObject<{
|
|
41
|
+
pads: z.ZodArray<z.ZodObject<{
|
|
42
|
+
number: z.ZodString;
|
|
43
|
+
shape: z.ZodEnum<{
|
|
44
|
+
circle: "circle";
|
|
45
|
+
oval: "oval";
|
|
46
|
+
rect: "rect";
|
|
47
|
+
roundrect: "roundrect";
|
|
48
|
+
}>;
|
|
49
|
+
x: z.ZodNumber;
|
|
50
|
+
y: z.ZodNumber;
|
|
51
|
+
width: z.ZodNumber;
|
|
52
|
+
height: z.ZodNumber;
|
|
53
|
+
rotation: z.ZodOptional<z.ZodNumber>;
|
|
54
|
+
layers: z.ZodOptional<z.ZodEnum<{
|
|
55
|
+
through: "through";
|
|
56
|
+
top: "top";
|
|
57
|
+
}>>;
|
|
58
|
+
drill: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
|
|
59
|
+
width: z.ZodNumber;
|
|
60
|
+
height: z.ZodNumber;
|
|
61
|
+
}, z.core.$strict>]>>;
|
|
62
|
+
}, z.core.$strict>>;
|
|
63
|
+
courtyard: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodNumber>>>;
|
|
64
|
+
silkscreen: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodArray<z.ZodNumber>>>>;
|
|
65
|
+
body: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodNumber>>>;
|
|
66
|
+
placeholder: z.ZodOptional<z.ZodBoolean>;
|
|
67
|
+
}, z.core.$strict>;
|
|
35
68
|
export type FootprintFile = z.infer<typeof FootprintFileSchema>;
|
|
36
69
|
interface PinList {
|
|
37
70
|
pins: Readonly<Record<string, {
|
|
@@ -18,17 +18,25 @@ const PadEntrySchema = z
|
|
|
18
18
|
drill: z.union([size, z.object({ width: size, height: size }).strict()]).optional(),
|
|
19
19
|
})
|
|
20
20
|
.strict();
|
|
21
|
-
/** The land pattern
|
|
22
|
-
|
|
21
|
+
/** The land pattern with `pair` as the way a point is written. */
|
|
22
|
+
const footprintFile = (pair) => z
|
|
23
23
|
.object({
|
|
24
24
|
pads: z.array(PadEntrySchema).min(1),
|
|
25
|
-
courtyard: z.array(
|
|
26
|
-
silkscreen: z.array(z.array(
|
|
27
|
-
body: z.array(
|
|
25
|
+
courtyard: z.array(pair).min(3).optional(),
|
|
26
|
+
silkscreen: z.array(z.array(pair).min(2)).optional(),
|
|
27
|
+
body: z.array(pair).min(3).optional(),
|
|
28
28
|
/** The pads are not the land pattern yet (the part wizard's stub): the board refuses the part until a person draws them. */
|
|
29
29
|
placeholder: z.boolean().optional(),
|
|
30
30
|
})
|
|
31
31
|
.strict();
|
|
32
|
+
/** The land pattern as a person writes it in footprint.yaml: pads in mm, y up, origin at the part centre. */
|
|
33
|
+
export const FootprintFileSchema = footprintFile(point);
|
|
34
|
+
/**
|
|
35
|
+
* The same land pattern for a tool's input: a point is a list of exactly two numbers, not a pair type. A pair's JSON
|
|
36
|
+
* schema writes `items` as a list, and a client that reads schemas as JSON Schema 2020-12 drops the whole tool for it.
|
|
37
|
+
* Parse what arrives with FootprintFileSchema to get the pairs.
|
|
38
|
+
*/
|
|
39
|
+
export const FootprintFileInputSchema = footprintFile(z.array(length).length(2));
|
|
32
40
|
/**
|
|
33
41
|
* The footprint a footprint.yaml describes, or an error that names the file and, for pad
|
|
34
42
|
* problems, the pad. Which pins the part has is checked separately, with `pinErrors`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/engine/footprints/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,sFAAsF;AACtF,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,CAAA;AAE5C,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;AAClC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAA;AAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAEvC,MAAM,cAAc,GAAG,CAAC;KACrB,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,oDAAoD,CAAC;IAC/F,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,MAAM;IACT,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;IAC3B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7C,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;CACpF,CAAC;KACD,MAAM,EAAE,CAAA;AAEX,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/engine/footprints/file.ts"],"names":[],"mappings":"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"}
|
package/dist/engine/model.d.ts
CHANGED
|
@@ -75,6 +75,8 @@ export interface Component {
|
|
|
75
75
|
schNameAt?: Point;
|
|
76
76
|
schValueAt?: Point;
|
|
77
77
|
pcbNameAt?: Point;
|
|
78
|
+
/** The silkscreen designator's turn when the file sets it (pcbNameRotation): 0 reads left to right, 90 from the bottom up. */
|
|
79
|
+
pcbNameRotation?: 0 | 90;
|
|
78
80
|
}
|
|
79
81
|
/** Named: "net.GND". Unnamed: "net:" + the first pin id. */
|
|
80
82
|
export interface Net {
|
|
@@ -231,6 +233,15 @@ export interface SheetPortSpec {
|
|
|
231
233
|
order: number;
|
|
232
234
|
/** A bus port: joins the members of the bus its name stands for ("D[0:7]" is D0 … D7) by name. */
|
|
233
235
|
bus?: true;
|
|
236
|
+
/** The electrical type of the instance's pin; absent, passive. */
|
|
237
|
+
type?: PinType;
|
|
238
|
+
/** What it carries, e.g. "0 to 24 V from the field". */
|
|
239
|
+
carries?: string;
|
|
240
|
+
}
|
|
241
|
+
/** What a sheet says of itself on `<sheet does sources>`. */
|
|
242
|
+
export interface SheetCard {
|
|
243
|
+
does?: string;
|
|
244
|
+
sources?: string[];
|
|
234
245
|
}
|
|
235
246
|
/** The symbol size a `<sheet width height>` writes, in sheet units; absent, the ports decide it. */
|
|
236
247
|
export interface SheetSize {
|
|
@@ -266,6 +277,9 @@ export interface SheetInstance {
|
|
|
266
277
|
connections: Record<string, string>;
|
|
267
278
|
/** The sheet's ports in the order they are written. */
|
|
268
279
|
ports: InstancePort[];
|
|
280
|
+
/** What the sheet says it does, and its sources, when it says. */
|
|
281
|
+
does?: string;
|
|
282
|
+
sources?: string[];
|
|
269
283
|
/** The flattened ids of every part inside, nested instances included, in natural order. */
|
|
270
284
|
parts: string[];
|
|
271
285
|
/** The sheet symbol's size as the sheet file writes it; absent when it writes none. */
|
|
@@ -305,6 +319,6 @@ export interface Circuit {
|
|
|
305
319
|
name: string;
|
|
306
320
|
ports: SheetPortSpec[];
|
|
307
321
|
size?: SheetSize;
|
|
308
|
-
};
|
|
322
|
+
} & SheetCard;
|
|
309
323
|
diagnostics: Diagnostic[];
|
|
310
324
|
}
|
package/dist/engine/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/engine/model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/engine/model.ts"],"names":[],"mappings":"AAqMA,8EAA8E;AAC9E,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAA;AAE/B,+CAA+C;AAC/C,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAwB,EAAU,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,SAAS,CAAA"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Design } from "../design.js";
|
|
2
|
+
import type { Placement, PlaceOptions } from "./index.js";
|
|
3
|
+
/** Whether whole-board placement goes by blocks: the scope is the board and it has top-level instances, none locked. */
|
|
4
|
+
export declare function placesByBlocks(design: Design, options: PlaceOptions): boolean;
|
|
5
|
+
/**
|
|
6
|
+
* Places the board by its blocks (see the module comment); undefined when a sheet's first instance cannot be laid out
|
|
7
|
+
* on its own, so the caller places the board part by part instead.
|
|
8
|
+
*/
|
|
9
|
+
export declare function placeByBlocks(design: Design, options: PlaceOptions, layOut: (instance: string) => Placement): Placement | undefined;
|
|
@@ -0,0 +1,256 @@
|
|
|
1
|
+
import { naturalCompare } from "../order.js";
|
|
2
|
+
import { besideShift } from "./blocks.js";
|
|
3
|
+
import { construct, OUT_OF_TIME } from "./constructive.js";
|
|
4
|
+
import { boxOfPoints, EPSILON, moved as movedBox, ROTATIONS, turn } from "./geometry.js";
|
|
5
|
+
import { refine } from "./refine.js";
|
|
6
|
+
import { readProblem } from "./scope.js";
|
|
7
|
+
import { edgeTouches, NetModel, ratsnestLength } from "./score.js";
|
|
8
|
+
const frameOf = (instance) => instance.pcb ?? { x: 0, y: 0, rotation: 0 };
|
|
9
|
+
const tidy = (v) => Math.round(v * 1e6) / 1e6 || 0;
|
|
10
|
+
const quarterOf = (degrees) => Math.round(degrees / 90) & 3;
|
|
11
|
+
const isLocked = (instance, locked) => locked.has(instance.path) || instance.parts.some((part) => locked.has(part));
|
|
12
|
+
function rotate(p, degrees) {
|
|
13
|
+
const quarter = degrees / 90;
|
|
14
|
+
if (Number.isInteger(quarter))
|
|
15
|
+
return turn(p, quarter);
|
|
16
|
+
const r = (degrees * Math.PI) / 180;
|
|
17
|
+
return { x: p.x * Math.cos(r) - p.y * Math.sin(r), y: p.x * Math.sin(r) + p.y * Math.cos(r) };
|
|
18
|
+
}
|
|
19
|
+
const toLocal = (p, frame) => rotate({ x: p.x - frame.x, y: p.y - frame.y }, -frame.rotation);
|
|
20
|
+
/** The top-level instances by sheet file, in natural order, each group led by its first instance. */
|
|
21
|
+
function sheetGroups(design) {
|
|
22
|
+
const top = (design.circuit.instances ?? []).filter((instance) => !instance.path.includes("/")).sort((a, b) => naturalCompare(a.path, b.path));
|
|
23
|
+
const files = [...new Set(top.map((instance) => instance.file))];
|
|
24
|
+
return files.map((file) => top.filter((instance) => instance.file === file));
|
|
25
|
+
}
|
|
26
|
+
/** A part's courtyard box and its pads (in footprint order) at a pose on the board. */
|
|
27
|
+
function shapeAt(part, pose) {
|
|
28
|
+
const quarter = quarterOf(pose.rotation);
|
|
29
|
+
const courtyard = part.footprint?.courtyard ?? part.courtyard.map((p) => rotate({ x: p.x - part.x, y: p.y - part.y }, -part.rotation));
|
|
30
|
+
const box = movedBox(boxOfPoints(courtyard.map((p) => turn(p, quarter))), pose.x, pose.y);
|
|
31
|
+
const pads = (part.footprint?.pads ?? []).map((pad) => {
|
|
32
|
+
const t = turn(pad, quarter);
|
|
33
|
+
return { x: t.x + pose.x, y: t.y + pose.y };
|
|
34
|
+
});
|
|
35
|
+
return { box, pads };
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* The bodies of one sheet's instances: the leader's parts at `poses` (on the board, in the leader's present frame), taken
|
|
39
|
+
* into the leader's own frame; each other instance has the same shape with its own twins' nets.
|
|
40
|
+
*/
|
|
41
|
+
function bodiesOf(design, group, poses) {
|
|
42
|
+
const leader = group[0];
|
|
43
|
+
const components = new Map(design.circuit.components.map((c) => [c.id, c]));
|
|
44
|
+
const parts = new Map(design.pcb.parts.map((p) => [p.component, p]));
|
|
45
|
+
const keyIn = (c, instance) => `${(c.instance ?? "").slice(instance.path.length)}|${c.localId ?? c.id}`;
|
|
46
|
+
const from = frameOf(leader);
|
|
47
|
+
const boxes = [];
|
|
48
|
+
const local = [];
|
|
49
|
+
for (const id of [...leader.parts].sort(naturalCompare)) {
|
|
50
|
+
const component = components.get(id);
|
|
51
|
+
const part = parts.get(id);
|
|
52
|
+
const pose = poses.get(id);
|
|
53
|
+
if (!component || !part || !pose)
|
|
54
|
+
return undefined;
|
|
55
|
+
const shape = shapeAt(part, pose);
|
|
56
|
+
const corners = [toLocal({ x: shape.box.minX, y: shape.box.minY }, from), toLocal({ x: shape.box.maxX, y: shape.box.maxY }, from)];
|
|
57
|
+
boxes.push(boxOfPoints(corners));
|
|
58
|
+
local.push({ key: keyIn(component, leader), pads: shape.pads.map((p) => toLocal(p, from)) });
|
|
59
|
+
}
|
|
60
|
+
const box = boxOfPoints(boxes.flatMap((b) => [{ x: b.minX, y: b.minY }, { x: b.maxX, y: b.maxY }]));
|
|
61
|
+
return group.map((instance) => {
|
|
62
|
+
const twins = new Map(instance.parts.flatMap((id) => {
|
|
63
|
+
const c = components.get(id);
|
|
64
|
+
return c ? [[keyIn(c, instance), parts.get(id)]] : [];
|
|
65
|
+
}));
|
|
66
|
+
const pads = local.flatMap(({ key, pads: at }) => at.map((p, k) => ({ x: p.x, y: p.y, net: twins.get(key)?.pads[k]?.net })));
|
|
67
|
+
return { instance, leader, frame: frameOf(instance), box, pads };
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
/** A body as a movable "part" whose origin is its instance's frame origin, turned by `quarter` at every rotation. */
|
|
71
|
+
function bodyMovable(body, quarter, netIndex, connected, component) {
|
|
72
|
+
const corners = [turn({ x: body.box.minX, y: body.box.minY }, quarter), turn({ x: body.box.maxX, y: body.box.maxY }, quarter)];
|
|
73
|
+
const box = boxOfPoints(corners);
|
|
74
|
+
const pads = body.pads.map((pad) => {
|
|
75
|
+
const t = turn(pad, quarter);
|
|
76
|
+
return { x: t.x, y: t.y, net: pad.net === undefined ? -1 : (netIndex.get(pad.net) ?? -1) };
|
|
77
|
+
});
|
|
78
|
+
const connections = body.pads.filter((pad) => pad.net !== undefined && connected.has(pad.net)).length;
|
|
79
|
+
return { name: body.instance.path, component, boxes: [box, box, box, box], pads: [pads, pads, pads, pads], role: "other", connections, start: { x: body.frame.x, y: body.frame.y, rotation: 0 } };
|
|
80
|
+
}
|
|
81
|
+
/** For each connector, where the pads it connects to are on average in `sketch` (its own and unplaced ones left out). */
|
|
82
|
+
function connectorTargets(problem, sketch, unplaced) {
|
|
83
|
+
const targets = new Map();
|
|
84
|
+
problem.movables.forEach((m, c) => {
|
|
85
|
+
if (m.role !== "connector")
|
|
86
|
+
return;
|
|
87
|
+
const nets = new Set((m.pads[0] ?? []).map((p) => p.net).filter((n) => n >= 0));
|
|
88
|
+
let [sx, sy, n] = [0, 0, 0];
|
|
89
|
+
problem.movables.forEach((other, k) => {
|
|
90
|
+
if (k === c || unplaced.has(k) || other.role === "connector")
|
|
91
|
+
return;
|
|
92
|
+
for (const pad of other.pads[sketch.rot[k]] ?? []) {
|
|
93
|
+
if (!nets.has(pad.net))
|
|
94
|
+
continue;
|
|
95
|
+
sx += sketch.x[k] + pad.x;
|
|
96
|
+
sy += sketch.y[k] + pad.y;
|
|
97
|
+
n++;
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
if (n > 0)
|
|
101
|
+
targets.set(c, { x: sx / n, y: sy / n });
|
|
102
|
+
});
|
|
103
|
+
return targets;
|
|
104
|
+
}
|
|
105
|
+
/** Whether whole-board placement goes by blocks: the scope is the board and it has top-level instances, none locked. */
|
|
106
|
+
export function placesByBlocks(design, options) {
|
|
107
|
+
if ((options.scope ?? { kind: "all" }).kind !== "all" || options.connectorsAhead === true)
|
|
108
|
+
return false;
|
|
109
|
+
const locked = new Set(options.locked ?? []);
|
|
110
|
+
const groups = sheetGroups(design);
|
|
111
|
+
return groups.length > 0 && groups.every((group) => group.every((instance) => !isLocked(instance, locked)));
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Places the board by its blocks (see the module comment); undefined when a sheet's first instance cannot be laid out
|
|
115
|
+
* on its own, so the caller places the board part by part instead.
|
|
116
|
+
*/
|
|
117
|
+
export function placeByBlocks(design, options, layOut) {
|
|
118
|
+
const clock = options.clock ?? (() => performance.now());
|
|
119
|
+
const began = clock();
|
|
120
|
+
const groups = sheetGroups(design);
|
|
121
|
+
const parts = new Map(design.pcb.parts.map((p) => [p.component, p]));
|
|
122
|
+
const leaderPoses = new Map();
|
|
123
|
+
const laidOut = new Map();
|
|
124
|
+
const bodies = [];
|
|
125
|
+
for (const group of groups) {
|
|
126
|
+
const leader = group[0];
|
|
127
|
+
const own = leader.parts.some((id) => parts.get(id)?.autoPlaced);
|
|
128
|
+
if (own) {
|
|
129
|
+
const lead = layOut(leader.path);
|
|
130
|
+
if (lead.unplaced.length > 0)
|
|
131
|
+
return undefined;
|
|
132
|
+
for (const [name, pose] of lead.positions)
|
|
133
|
+
laidOut.set(name, pose);
|
|
134
|
+
}
|
|
135
|
+
for (const id of leader.parts) {
|
|
136
|
+
const part = parts.get(id);
|
|
137
|
+
if (part)
|
|
138
|
+
leaderPoses.set(id, laidOut.get(id) ?? { x: part.x, y: part.y, rotation: part.rotation });
|
|
139
|
+
}
|
|
140
|
+
const made = bodiesOf(design, group, leaderPoses);
|
|
141
|
+
if (!made)
|
|
142
|
+
return undefined;
|
|
143
|
+
bodies.push(made);
|
|
144
|
+
}
|
|
145
|
+
const aside = new Set(groups.flat().flatMap((instance) => instance.parts));
|
|
146
|
+
const base = readProblem(design, { ...options, scope: { kind: "all" } }, aside);
|
|
147
|
+
const netIndex = new Map(base.nets.map((n, i) => [n, i]));
|
|
148
|
+
const padCounts = new Map();
|
|
149
|
+
for (const part of design.pcb.parts)
|
|
150
|
+
for (const pad of part.pads)
|
|
151
|
+
if (pad.net !== undefined)
|
|
152
|
+
padCounts.set(pad.net, (padCounts.get(pad.net) ?? 0) + 1);
|
|
153
|
+
const connected = new Set([...padCounts].filter(([, n]) => n > 1).map(([net]) => net));
|
|
154
|
+
const componentOf = new Map(design.circuit.components.map((c) => [c.id, c]));
|
|
155
|
+
const flat = bodies.flat();
|
|
156
|
+
const left = options.budgetMs === undefined ? undefined : () => Math.max(0, options.budgetMs - (clock() - began));
|
|
157
|
+
let best;
|
|
158
|
+
for (let quarter = 0; quarter < 4; quarter++) {
|
|
159
|
+
const macros = flat.map((body) => bodyMovable(body, quarter, netIndex, connected, componentOf.get(body.instance.parts[0])));
|
|
160
|
+
const problem = { ...base, movables: [...base.movables, ...macros] };
|
|
161
|
+
const fresh = () => ({
|
|
162
|
+
x: Float64Array.from(problem.movables, (m) => m.start.x),
|
|
163
|
+
y: Float64Array.from(problem.movables, (m) => m.start.y),
|
|
164
|
+
rot: Uint8Array.from(problem.movables, (m, i) => (i < base.movables.length ? quarterOf(m.start.rotation) : 0)),
|
|
165
|
+
});
|
|
166
|
+
// Each turn gets an equal share of what is left of the budget.
|
|
167
|
+
const share = left === undefined ? undefined : left() / (4 - quarter);
|
|
168
|
+
const runStart = clock();
|
|
169
|
+
const late = share === undefined ? () => false : () => clock() - runStart >= share;
|
|
170
|
+
// A first pass, connectors last, shows where the blocks go; then the connectors go first, on the edge nearest the
|
|
171
|
+
// blocks they serve, and the blocks after them.
|
|
172
|
+
const sketch = fresh();
|
|
173
|
+
const first = construct(problem, sketch, late);
|
|
174
|
+
const state = fresh();
|
|
175
|
+
const built = construct(problem, state, late, undefined, false, connectorTargets(problem, sketch, new Set(first.unplaced.map((u) => u.index))));
|
|
176
|
+
const frozen = new Set(built.unplaced.map((u) => u.index));
|
|
177
|
+
const rest = share === undefined ? {} : { budgetMs: Math.max(0, share - (clock() - runStart)) };
|
|
178
|
+
const refined = options.refine === false ? undefined : refine(problem, state, frozen, { ...(options.seed === undefined ? {} : { seed: options.seed }), ...rest, clock });
|
|
179
|
+
const final = refined?.state ?? state;
|
|
180
|
+
const wire = refined?.after ?? new NetModel(problem).measure(final);
|
|
181
|
+
const solved = { quarter, problem, final, frozen, unplaced: built.unplaced, notes: built.notes, wire, budgetSpent: built.unplaced.some((u) => u.reason === OUT_OF_TIME) || (refined?.budgetSpent ?? false) };
|
|
182
|
+
const better = !best || solved.unplaced.length < best.unplaced.length || (solved.unplaced.length === best.unplaced.length && solved.wire < best.wire - 1e-9);
|
|
183
|
+
if (better)
|
|
184
|
+
best = solved;
|
|
185
|
+
}
|
|
186
|
+
const chosen = best;
|
|
187
|
+
return written(design, chosen, flat, base.movables.length, laidOut);
|
|
188
|
+
}
|
|
189
|
+
/** The placement the chosen run gives: part positions, the leaders' laid-out parts, and every body as a block move. */
|
|
190
|
+
function written(design, solved, flat, firstBody, laidOut) {
|
|
191
|
+
const { problem, final, frozen, quarter } = solved;
|
|
192
|
+
const positions = new Map(laidOut);
|
|
193
|
+
const moved = [...laidOut.keys()];
|
|
194
|
+
problem.movables.slice(0, firstBody).forEach((m, i) => {
|
|
195
|
+
if (frozen.has(i))
|
|
196
|
+
return;
|
|
197
|
+
const at = { x: tidy(final.x[i]), y: tidy(final.y[i]), rotation: ROTATIONS[final.rot[i]] };
|
|
198
|
+
positions.set(m.name, at);
|
|
199
|
+
if (Math.abs(at.x - m.start.x) >= EPSILON || Math.abs(at.y - m.start.y) >= EPSILON || at.rotation !== m.start.rotation)
|
|
200
|
+
moved.push(m.name);
|
|
201
|
+
});
|
|
202
|
+
// Bodies with no room on the board go beside it, in order, each clear of what is placed.
|
|
203
|
+
const taken = problem.obstacles.map((o) => o.box);
|
|
204
|
+
const targets = new Map();
|
|
205
|
+
const add = (net, p) => targets.set(net, [...(targets.get(net) ?? []), p]);
|
|
206
|
+
problem.fixedPads.forEach((pads, k) => pads.forEach((p) => add(problem.nets[k], p)));
|
|
207
|
+
problem.movables.forEach((m, i) => {
|
|
208
|
+
if (frozen.has(i))
|
|
209
|
+
return;
|
|
210
|
+
const [x, y, r] = [final.x[i], final.y[i], final.rot[i]];
|
|
211
|
+
taken.push(movedBox(m.boxes[r], x, y));
|
|
212
|
+
for (const pad of m.pads[r] ?? [])
|
|
213
|
+
if (pad.net >= 0)
|
|
214
|
+
add(problem.nets[pad.net], { x: pad.x + x, y: pad.y + y });
|
|
215
|
+
});
|
|
216
|
+
const blocks = [];
|
|
217
|
+
const notes = [...solved.notes];
|
|
218
|
+
const beside = [];
|
|
219
|
+
const rotation = ROTATIONS[quarter];
|
|
220
|
+
flat.forEach((body, k) => {
|
|
221
|
+
const i = firstBody + k;
|
|
222
|
+
const m = problem.movables[i];
|
|
223
|
+
let at = frozen.has(i) ? undefined : { x: final.x[i], y: final.y[i] };
|
|
224
|
+
if (!at) {
|
|
225
|
+
const pads = (m.pads[0] ?? []).flatMap((pad) => (pad.net >= 0 ? [{ x: pad.x + m.start.x, y: pad.y + m.start.y, net: problem.nets[pad.net] }] : []));
|
|
226
|
+
const shift = besideShift({ parts: [], boxes: [movedBox(m.boxes[0], m.start.x, m.start.y)], pads }, problem, taken, targets);
|
|
227
|
+
if (!shift) {
|
|
228
|
+
notes.push(`${body.instance.path} found no free room as a block, on the board or beside it; it was left where it is`);
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
at = { x: m.start.x + shift.x, y: m.start.y + shift.y };
|
|
232
|
+
taken.push(movedBox(m.boxes[0], at.x, at.y));
|
|
233
|
+
const b = m.boxes[0];
|
|
234
|
+
beside.push({ instance: body.instance.path, reason: `no free room on the board for its ${(b.maxX - b.minX).toFixed(1)} x ${(b.maxY - b.minY).toFixed(1)} mm block; it was put beside the board` });
|
|
235
|
+
}
|
|
236
|
+
const [dx, dy] = [tidy(at.x - body.frame.x), tidy(at.y - body.frame.y)];
|
|
237
|
+
const turned = Math.abs(rotation - body.frame.rotation) > EPSILON;
|
|
238
|
+
if (Math.abs(dx) < EPSILON && Math.abs(dy) < EPSILON && !turned)
|
|
239
|
+
return;
|
|
240
|
+
blocks.push({ instance: body.instance.path, dx, dy, ...(turned ? { rotation } : {}), parts: [...body.instance.parts].sort(naturalCompare) });
|
|
241
|
+
if (body.instance !== body.leader)
|
|
242
|
+
notes.push(`${body.instance.path} was moved as a block, keeping the arrangement of ${body.leader.path}`);
|
|
243
|
+
});
|
|
244
|
+
return {
|
|
245
|
+
positions,
|
|
246
|
+
blocks,
|
|
247
|
+
score: { wireLength: solved.wire, edgeTouches: edgeTouches(problem, final, frozen) },
|
|
248
|
+
before: { wireLength: ratsnestLength(design.pcb.parts) },
|
|
249
|
+
moved: moved.sort(naturalCompare),
|
|
250
|
+
unplaced: solved.unplaced.filter((u) => u.index < firstBody).map((u) => ({ name: problem.movables[u.index]?.name, reason: u.reason })),
|
|
251
|
+
notes,
|
|
252
|
+
beside,
|
|
253
|
+
budgetSpent: solved.budgetSpent,
|
|
254
|
+
};
|
|
255
|
+
}
|
|
256
|
+
//# sourceMappingURL=block-board.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"block-board.js","sourceRoot":"","sources":["../../../src/engine/pcb-place/block-board.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Design } from "../design.js";
|
|
2
|
-
import type { SheetInstance } from "../model.js";
|
|
2
|
+
import type { Point, SheetInstance } from "../model.js";
|
|
3
|
+
import { type Box } from "./geometry.js";
|
|
3
4
|
import { type Problem, type ScopeOptions } from "./scope.js";
|
|
4
5
|
import type { State } from "./score.js";
|
|
5
6
|
/** An instance moved as a whole: its anchor shifts by (dx, dy) on the board; `parts` are those that move with it. */
|
|
@@ -7,6 +8,8 @@ export interface BlockMove {
|
|
|
7
8
|
instance: string;
|
|
8
9
|
dx: number;
|
|
9
10
|
dy: number;
|
|
11
|
+
/** The instance's new turn on the board in degrees, when it changes. */
|
|
12
|
+
rotation?: number;
|
|
10
13
|
parts: string[];
|
|
11
14
|
}
|
|
12
15
|
/** An instance to place as a block, and the instance of the same sheet whose arrangement it copies. */
|
|
@@ -25,22 +28,44 @@ interface Pose {
|
|
|
25
28
|
y: number;
|
|
26
29
|
rotation: number;
|
|
27
30
|
}
|
|
31
|
+
export interface Body {
|
|
32
|
+
parts: string[];
|
|
33
|
+
boxes: Box[];
|
|
34
|
+
pads: {
|
|
35
|
+
x: number;
|
|
36
|
+
y: number;
|
|
37
|
+
net: string;
|
|
38
|
+
}[];
|
|
39
|
+
}
|
|
28
40
|
/**
|
|
29
41
|
* The instances to place as blocks. For the whole board: in each group of top-level instances of one sheet, every
|
|
30
42
|
* instance but the first with a part to place (or the first). For one instance with nothing of its own to place: that
|
|
31
43
|
* instance. A locked instance, or one with a locked part, is left where it is and named.
|
|
32
44
|
*/
|
|
33
45
|
export declare function planCopies(design: Design, options: ScopeOptions): Copies;
|
|
46
|
+
/**
|
|
47
|
+
* The shift that puts the body in free room beside the board when the board has none: the area widened on every side
|
|
48
|
+
* by the block's size (and its clearance), step by step, nearest its connections.
|
|
49
|
+
*/
|
|
50
|
+
export declare function besideShift(body: Body, problem: Problem, taken: readonly Box[], targets: ReadonlyMap<string, Point[]>): Point | undefined;
|
|
51
|
+
/** What placing the followers gave: the moves, the notes, and the instances that had to go beside the board. */
|
|
52
|
+
export interface Copied {
|
|
53
|
+
blocks: BlockMove[];
|
|
54
|
+
notes: string[];
|
|
55
|
+
/** Instances with no free room on the board, put beside it (never on another instance), with the reason. */
|
|
56
|
+
beside: {
|
|
57
|
+
instance: string;
|
|
58
|
+
reason: string;
|
|
59
|
+
}[];
|
|
60
|
+
}
|
|
34
61
|
/**
|
|
35
62
|
* Places each follower as a block once the rest is placed (`positions` and `final`): an instance whose copy would overlap
|
|
36
|
-
* something or leave the board moves to the free spot nearest its connections
|
|
63
|
+
* something or leave the board moves to the free spot nearest its connections; with no free spot on the board, to the
|
|
64
|
+
* nearest free room beside it (fitting the board then grows it round the block), and it is named in `beside`.
|
|
37
65
|
*/
|
|
38
66
|
export declare function placeCopies(design: Design, problem: Problem, placed: {
|
|
39
67
|
final: State;
|
|
40
68
|
frozen: ReadonlySet<number>;
|
|
41
69
|
positions: ReadonlyMap<string, Pose>;
|
|
42
|
-
}, followers: readonly Follower[]):
|
|
43
|
-
blocks: BlockMove[];
|
|
44
|
-
notes: string[];
|
|
45
|
-
};
|
|
70
|
+
}, followers: readonly Follower[]): Copied;
|
|
46
71
|
export {};
|
|
@@ -128,14 +128,14 @@ function surroundings(problem, final, frozen) {
|
|
|
128
128
|
});
|
|
129
129
|
return { taken, targets };
|
|
130
130
|
}
|
|
131
|
-
/** The shift that puts the body in free room nearest the pads it connects to, or undefined when there is none. */
|
|
132
|
-
function freeShift(body, problem, taken, targets) {
|
|
131
|
+
/** The shift that puts the body in free room of `room` nearest the pads it connects to, or undefined when there is none. */
|
|
132
|
+
function freeShift(body, problem, taken, targets, room = problem.area) {
|
|
133
133
|
const fits = (dx, dy) => body.boxes.every((b) => {
|
|
134
134
|
const at = moved(b, dx, dy);
|
|
135
|
-
return inArea(at,
|
|
135
|
+
return inArea(at, room) && !taken.some((t) => tooClose(at, t, problem.clearance));
|
|
136
136
|
});
|
|
137
137
|
const bounds = boxOfPoints(body.boxes.flatMap((b) => [{ x: b.minX, y: b.minY }, { x: b.maxX, y: b.maxY }]));
|
|
138
|
-
const area =
|
|
138
|
+
const area = room.box;
|
|
139
139
|
const range = { lo: { x: area.minX - bounds.minX, y: area.minY - bounds.minY }, hi: { x: area.maxX - bounds.maxX, y: area.maxY - bounds.maxY } };
|
|
140
140
|
if (range.lo.x > range.hi.x || range.lo.y > range.hi.y)
|
|
141
141
|
return undefined;
|
|
@@ -153,21 +153,49 @@ function freeShift(body, problem, taken, targets) {
|
|
|
153
153
|
const found = candidates.find((c) => fits(c.dx, c.dy));
|
|
154
154
|
return found ? { x: found.dx, y: found.dy } : undefined;
|
|
155
155
|
}
|
|
156
|
+
/** How many times the room round the board is widened, by the block's own size each time, before giving up. */
|
|
157
|
+
const GROW_STEPS = 8;
|
|
158
|
+
const boundsOf = (body) => boxOfPoints(body.boxes.flatMap((b) => [{ x: b.minX, y: b.minY }, { x: b.maxX, y: b.maxY }]));
|
|
159
|
+
/**
|
|
160
|
+
* The shift that puts the body in free room beside the board when the board has none: the area widened on every side
|
|
161
|
+
* by the block's size (and its clearance), step by step, nearest its connections.
|
|
162
|
+
*/
|
|
163
|
+
export function besideShift(body, problem, taken, targets) {
|
|
164
|
+
const bounds = boundsOf(body);
|
|
165
|
+
const grow = Math.max(bounds.maxX - bounds.minX, bounds.maxY - bounds.minY) + 2 * problem.clearance;
|
|
166
|
+
const box = problem.area.box;
|
|
167
|
+
for (let k = 1; k <= GROW_STEPS; k++) {
|
|
168
|
+
const g = grow * k;
|
|
169
|
+
const room = { box: { minX: box.minX - g, minY: box.minY - g, maxX: box.maxX + g, maxY: box.maxY + g }, edge: problem.area.edge };
|
|
170
|
+
const found = freeShift(body, problem, taken, targets, room);
|
|
171
|
+
if (found)
|
|
172
|
+
return found;
|
|
173
|
+
}
|
|
174
|
+
return undefined;
|
|
175
|
+
}
|
|
156
176
|
/**
|
|
157
177
|
* Places each follower as a block once the rest is placed (`positions` and `final`): an instance whose copy would overlap
|
|
158
|
-
* something or leave the board moves to the free spot nearest its connections
|
|
178
|
+
* something or leave the board moves to the free spot nearest its connections; with no free spot on the board, to the
|
|
179
|
+
* nearest free room beside it (fitting the board then grows it round the block), and it is named in `beside`.
|
|
159
180
|
*/
|
|
160
181
|
export function placeCopies(design, problem, placed, followers) {
|
|
161
182
|
const { taken, targets } = surroundings(problem, placed.final, placed.frozen);
|
|
162
183
|
const blocks = [];
|
|
163
184
|
const notes = [];
|
|
185
|
+
const beside = [];
|
|
164
186
|
for (const follower of followers) {
|
|
165
187
|
const body = bodyOf(design, follower, placed.positions);
|
|
166
188
|
if (body.parts.length === 0)
|
|
167
189
|
continue;
|
|
168
190
|
const free = (dx, dy) => body.boxes.every((b) => inArea(moved(b, dx, dy), problem.area) && !taken.some((t) => tooClose(moved(b, dx, dy), t, problem.clearance)));
|
|
169
191
|
const stays = free(0, 0);
|
|
170
|
-
const
|
|
192
|
+
const inside = stays ? { x: 0, y: 0 } : freeShift(body, problem, taken, targets);
|
|
193
|
+
const shift = inside ?? besideShift(body, problem, taken, targets);
|
|
194
|
+
if (!inside && shift) {
|
|
195
|
+
const b = boundsOf(body);
|
|
196
|
+
const size = `${(b.maxX - b.minX).toFixed(1)} x ${(b.maxY - b.minY).toFixed(1)} mm`;
|
|
197
|
+
beside.push({ instance: follower.instance.path, reason: `no free room on the board for its ${size} block; it was put beside the board` });
|
|
198
|
+
}
|
|
171
199
|
if (!shift) {
|
|
172
200
|
notes.push(`${follower.instance.path} found no free room as a block; it was left where it is`);
|
|
173
201
|
continue;
|
|
@@ -179,8 +207,9 @@ export function placeCopies(design, problem, placed, followers) {
|
|
|
179
207
|
if (stays)
|
|
180
208
|
continue;
|
|
181
209
|
blocks.push({ instance: follower.instance.path, dx: shift.x, dy: shift.y, parts: body.parts });
|
|
182
|
-
|
|
210
|
+
if (inside)
|
|
211
|
+
notes.push(`${follower.instance.path} was moved as a block, keeping the arrangement of ${follower.leader.path}`);
|
|
183
212
|
}
|
|
184
|
-
return { blocks, notes };
|
|
213
|
+
return { blocks, notes, beside };
|
|
185
214
|
}
|
|
186
215
|
//# sourceMappingURL=blocks.js.map
|