circuit-to-canvas 0.0.57 → 0.0.58

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.58",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",