circuit-to-canvas 0.0.57 → 0.0.59

package/dist/index.d.ts

@@ -115,8 +115,11 @@ interface DrawCircleParams {
         y: number;
     };
     radius: number;
-    fill: string;
+    fill?: string;
     realToCanvasMat: Matrix;
+    stroke?: string;
+    strokeWidth?: number;
+    isStrokeDashed?: boolean;
 }
 declare function drawCircle(params: DrawCircleParams): void;
 

package/dist/index.js

@@ -642,13 +642,35 @@ function drawPcbCopperText(params) {
 // lib/drawer/shapes/circle.ts
 import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 function drawCircle(params) {
-  const { ctx, center, radius, fill, realToCanvasMat } = params;
+  const {
+    ctx,
+    center,
+    radius,
+    fill,
+    realToCanvasMat,
+    stroke,
+    strokeWidth,
+    isStrokeDashed = false
+  } = params;
   const [cx, cy] = applyToPoint7(realToCanvasMat, [center.x, center.y]);
   const scaledRadius = radius * Math.abs(realToCanvasMat.a);
+  const scaledStrokeWidth = strokeWidth ? strokeWidth * Math.abs(realToCanvasMat.a) : void 0;
   ctx.beginPath();
   ctx.arc(cx, cy, scaledRadius, 0, Math.PI * 2);
-  ctx.fillStyle = fill;
-  ctx.fill();
+  if (fill) {
+    ctx.fillStyle = fill;
+    ctx.fill();
+  }
+  if (stroke && scaledStrokeWidth) {
+    if (isStrokeDashed) {
+      ctx.setLineDash([scaledStrokeWidth * 3, scaledStrokeWidth * 2]);
+    } else {
+      ctx.setLineDash([]);
+    }
+    ctx.strokeStyle = stroke;
+    ctx.lineWidth = scaledStrokeWidth;
+    ctx.stroke();
+  }
 }
 
 // lib/drawer/elements/pcb-cutout.ts
@@ -1850,7 +1872,8 @@ function drawPcbSilkscreenCircle(params) {
     ctx,
     center: circle.center,
     radius: circle.radius,
-    fill: color,
+    stroke: color,
+    strokeWidth: circle.stroke_width,
     realToCanvasMat
   });
 }

package/lib/drawer/elements/pcb-silkscreen-circle.ts

@@ -27,7 +27,8 @@ export function drawPcbSilkscreenCircle(
     ctx,
     center: circle.center,
     radius: circle.radius,
-    fill: color,
+    stroke: color,
+    strokeWidth: circle.stroke_width,
     realToCanvasMat,
   })
 }

package/lib/drawer/shapes/circle.ts

@@ -6,18 +6,48 @@ export interface DrawCircleParams {
   ctx: CanvasContext
   center: { x: number; y: number }
   radius: number
-  fill: string
+  fill?: string
   realToCanvasMat: Matrix
+  stroke?: string
+  strokeWidth?: number
+  isStrokeDashed?: boolean
 }
 
 export function drawCircle(params: DrawCircleParams): void {
-  const { ctx, center, radius, fill, realToCanvasMat } = params
+  const {
+    ctx,
+    center,
+    radius,
+    fill,
+    realToCanvasMat,
+    stroke,
+    strokeWidth,
+    isStrokeDashed = false,
+  } = params
 
   const [cx, cy] = applyToPoint(realToCanvasMat, [center.x, center.y])
   const scaledRadius = radius * Math.abs(realToCanvasMat.a)
+  const scaledStrokeWidth = strokeWidth
+    ? strokeWidth * Math.abs(realToCanvasMat.a)
+    : undefined
 
   ctx.beginPath()
   ctx.arc(cx, cy, scaledRadius, 0, Math.PI * 2)
-  ctx.fillStyle = fill
-  ctx.fill()
+
+  if (fill) {
+    ctx.fillStyle = fill
+    ctx.fill()
+  }
+
+  if (stroke && scaledStrokeWidth) {
+    // Set up dashed line if needed (after path is drawn, before stroke)
+    if (isStrokeDashed) {
+      ctx.setLineDash([scaledStrokeWidth * 3, scaledStrokeWidth * 2])
+    } else {
+      ctx.setLineDash([])
+    }
+    ctx.strokeStyle = stroke
+    ctx.lineWidth = scaledStrokeWidth
+    ctx.stroke()
+  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-to-canvas",
   "main": "dist/index.js",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",

package/tests/elements/pcb-trace-hints.test.ts

@@ -0,0 +1,259 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw trace with port hints", async () => {
+  const canvas = createCanvas(800, 600)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  drawer.setCameraBounds({ minX: -8, minY: -2, maxX: 0, maxY: 6 })
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 800, 600)
+
+  const circuit: any = [
+    {
+      type: "source_component",
+      source_component_id: "simple_resistor_0",
+      name: "R1",
+      supplier_part_numbers: {},
+      ftype: "simple_resistor",
+      resistance: "10k",
+      pcbX: -5,
+      pcbY: 0,
+    },
+    {
+      type: "schematic_component",
+      source_component_id: "simple_resistor_0",
+      schematic_component_id: "schematic_component_simple_resistor_0",
+      rotation: 0,
+      size: {
+        width: 1,
+        height: 0.3,
+      },
+      center: {
+        x: 0,
+        y: 0,
+      },
+    },
+    {
+      type: "source_port",
+      name: "left",
+      source_port_id: "source_port_0",
+      source_component_id: "simple_resistor_0",
+    },
+    {
+      type: "schematic_port",
+      schematic_port_id: "schematic_port_0",
+      source_port_id: "source_port_0",
+      center: {
+        x: -0.5,
+        y: 0,
+      },
+      facing_direction: "left",
+      schematic_component_id: "schematic_component_simple_resistor_0",
+    },
+    {
+      type: "pcb_port",
+      pcb_port_id: "pcb_port_0",
+      source_port_id: "source_port_0",
+      pcb_component_id: "pcb_component_simple_resistor_0",
+      x: -5.95,
+      y: 0,
+      layers: ["top"],
+    },
+    {
+      type: "source_port",
+      name: "right",
+      source_port_id: "source_port_1",
+      source_component_id: "simple_resistor_0",
+    },
+    {
+      type: "schematic_port",
+      schematic_port_id: "schematic_port_1",
+      source_port_id: "source_port_1",
+      center: {
+        x: 0.5,
+        y: 0,
+      },
+      facing_direction: "right",
+      schematic_component_id: "schematic_component_simple_resistor_0",
+    },
+    {
+      type: "pcb_port",
+      pcb_port_id: "pcb_port_1",
+      source_port_id: "source_port_1",
+      pcb_component_id: "pcb_component_simple_resistor_0",
+      x: -4.05,
+      y: 0,
+      layers: ["top"],
+    },
+    {
+      type: "schematic_text",
+      text: "R1",
+      schematic_text_id: "schematic_text_0",
+      schematic_component_id: "schematic_component_simple_resistor_0",
+      anchor: "left",
+      position: {
+        x: -0.2,
+        y: -0.5,
+      },
+      rotation: 0,
+    },
+    {
+      type: "schematic_text",
+      text: "10k",
+      schematic_text_id: "schematic_text_1",
+      schematic_component_id: "schematic_component_simple_resistor_0",
+      anchor: "left",
+      position: {
+        x: -0.2,
+        y: -0.3,
+      },
+      rotation: 0,
+    },
+    {
+      type: "pcb_component",
+      source_component_id: "simple_resistor_0",
+      pcb_component_id: "pcb_component_simple_resistor_0",
+      layer: "top",
+      center: {
+        x: -5,
+        y: 0,
+      },
+      rotation: 0,
+      width: 3.1,
+      height: 1.2,
+    },
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pcb_smtpad_0",
+      shape: "rect",
+      x: -5.95,
+      y: 0,
+      width: 1.2,
+      height: 1.2,
+      layer: "top",
+      pcb_component_id: "pcb_component_simple_resistor_0",
+      port_hints: ["1", "left"],
+      pcb_port_id: "pcb_port_0",
+    },
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pcb_smtpad_1",
+      shape: "rect",
+      x: -4.05,
+      y: 0,
+      width: 1.2,
+      height: 1.2,
+      layer: "top",
+      pcb_component_id: "pcb_component_simple_resistor_0",
+      port_hints: ["2", "right"],
+      pcb_port_id: "pcb_port_1",
+    },
+    {
+      type: "source_trace",
+      source_trace_id: "source_trace_0",
+      connected_source_port_ids: ["source_port_0", "source_port_1"],
+      connected_source_net_ids: [],
+    },
+    {
+      type: "schematic_trace",
+      source_trace_id: "source_trace_0",
+      schematic_trace_id: "schematic_trace_0",
+      edges: [
+        {
+          from: {
+            x: -0.6000000000000001,
+            y: 0,
+          },
+          to: {
+            x: -0.6000000000000001,
+            y: -0.19999999999999996,
+          },
+        },
+        {
+          from: {
+            x: -0.6000000000000001,
+            y: -0.19999999999999996,
+          },
+          to: {
+            x: 0.7000000000000002,
+            y: -0.19999999999999996,
+          },
+        },
+        {
+          from: {
+            x: 0.7000000000000002,
+            y: -0.19999999999999996,
+          },
+          to: {
+            x: 0.7000000000000002,
+            y: 0,
+          },
+        },
+        {
+          from: {
+            x: -0.5,
+            y: 0,
+            ti: 0,
+          },
+          to: {
+            x: -0.6000000000000001,
+            y: 0,
+          },
+        },
+        {
+          from: {
+            x: 0.5,
+            y: 0,
+            ti: 1,
+          },
+          to: {
+            x: 0.7000000000000002,
+            y: 0,
+          },
+        },
+      ],
+    },
+    {
+      type: "pcb_trace",
+      pcb_trace_id: "pcb_trace_0",
+      source_trace_id: "source_trace_0",
+      route_thickness_mode: "interpolated",
+      route: [
+        {
+          route_type: "wire",
+          layer: "top",
+          width: 0.2,
+          x: -4,
+          y: 0,
+          start_pcb_port_id: "pcb_port_0",
+        },
+        {
+          route_type: "wire",
+          layer: "top",
+          width: 0.5,
+          x: -5.9,
+          y: 4,
+          start_pcb_port_id: "pcb_port_1",
+        },
+        {
+          route_type: "wire",
+          layer: "top",
+          width: 0.5,
+          x: -5.9,
+          y: 0,
+          start_pcb_port_id: "pcb_port_1",
+        },
+      ],
+    },
+  ]
+
+  drawer.drawElements(circuit)
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})