circuit-to-canvas 0.0.8 → 0.0.10

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AnyCircuitElement, PcbPlatedHole, PCBVia, PCBHole, PcbSmtPad, PCBTrace, PcbBoard, PcbSilkscreenText, PcbSilkscreenRect, PcbSilkscreenCircle, PcbSilkscreenLine, PcbSilkscreenPath, PcbCutout, PcbCopperPour, PcbCopperText, PcbFabricationNoteText, PcbFabricationNoteRect, PcbNoteRect, PcbFabricationNotePath, PcbNoteText } from 'circuit-json';
+import { AnyCircuitElement, PcbPlatedHole, PCBVia, PCBHole, PcbSmtPad, PCBTrace, PcbBoard, PcbSilkscreenText, PcbSilkscreenRect, PcbSilkscreenCircle, PcbSilkscreenLine, PcbSilkscreenPath, PcbCutout, PcbCopperPour, PcbCopperText, PcbFabricationNoteText, PcbFabricationNoteRect, PcbNoteRect, PcbFabricationNotePath, PcbNotePath, PcbNoteText } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 
 /**
@@ -370,6 +370,14 @@ interface DrawPcbFabricationNotePathParams {
 }
 declare function drawPcbFabricationNotePath(params: DrawPcbFabricationNotePathParams): void;
 
+interface DrawPcbNotePathParams {
+    ctx: CanvasContext;
+    path: PcbNotePath;
+    transform: Matrix;
+    colorMap: PcbColorMap;
+}
+declare function drawPcbNotePath(params: DrawPcbNotePathParams): void;
+
 interface DrawPcbNoteTextParams {
     ctx: CanvasContext;
     text: PcbNoteText;
@@ -378,4 +386,4 @@ interface DrawPcbNoteTextParams {
 }
 declare function drawPcbNoteText(params: DrawPcbNoteTextParams): void;
 
-export { type AlphabetLayout, type AnchorAlignment, type CameraBounds, type CanvasContext, CircuitToCanvasDrawer, type CopperColorMap, type CopperLayerName, DEFAULT_PCB_COLOR_MAP, type DrawCircleParams, type DrawContext, type DrawElementsOptions, type DrawLineParams, type DrawOvalParams, type DrawPathParams, type DrawPcbBoardParams, type DrawPcbCopperPourParams, type DrawPcbCopperTextParams, type DrawPcbCutoutParams, type DrawPcbFabricationNotePathParams, type DrawPcbFabricationNoteRectParams, type DrawPcbFabricationNoteTextParams, type DrawPcbHoleParams, type DrawPcbNoteRectParams, type DrawPcbNoteTextParams, type DrawPcbPlatedHoleParams, type DrawPcbSilkscreenCircleParams, type DrawPcbSilkscreenLineParams, type DrawPcbSilkscreenPathParams, type DrawPcbSilkscreenRectParams, type DrawPcbSilkscreenTextParams, type DrawPcbSmtPadParams, type DrawPcbTraceParams, type DrawPcbViaParams, type DrawPillParams, type DrawPolygonParams, type DrawRectParams, type DrawTextParams, type DrawerConfig, type PcbColorMap, drawCircle, drawLine, drawOval, drawPath, drawPcbBoard, drawPcbCopperPour, drawPcbCopperText, drawPcbCutout, drawPcbFabricationNotePath, drawPcbFabricationNoteRect, drawPcbFabricationNoteText, drawPcbHole, drawPcbNoteRect, drawPcbNoteText, drawPcbPlatedHole, drawPcbSilkscreenCircle, drawPcbSilkscreenLine, drawPcbSilkscreenPath, drawPcbSilkscreenRect, drawPcbSilkscreenText, drawPcbSmtPad, drawPcbTrace, drawPcbVia, drawPill, drawPolygon, drawRect, drawText, getAlphabetLayout, getTextStartPosition, strokeAlphabetText };
+export { type AlphabetLayout, type AnchorAlignment, type CameraBounds, type CanvasContext, CircuitToCanvasDrawer, type CopperColorMap, type CopperLayerName, DEFAULT_PCB_COLOR_MAP, type DrawCircleParams, type DrawContext, type DrawElementsOptions, type DrawLineParams, type DrawOvalParams, type DrawPathParams, type DrawPcbBoardParams, type DrawPcbCopperPourParams, type DrawPcbCopperTextParams, type DrawPcbCutoutParams, type DrawPcbFabricationNotePathParams, type DrawPcbFabricationNoteRectParams, type DrawPcbFabricationNoteTextParams, type DrawPcbHoleParams, type DrawPcbNotePathParams, type DrawPcbNoteRectParams, type DrawPcbNoteTextParams, type DrawPcbPlatedHoleParams, type DrawPcbSilkscreenCircleParams, type DrawPcbSilkscreenLineParams, type DrawPcbSilkscreenPathParams, type DrawPcbSilkscreenRectParams, type DrawPcbSilkscreenTextParams, type DrawPcbSmtPadParams, type DrawPcbTraceParams, type DrawPcbViaParams, type DrawPillParams, type DrawPolygonParams, type DrawRectParams, type DrawTextParams, type DrawerConfig, type PcbColorMap, drawCircle, drawLine, drawOval, drawPath, drawPcbBoard, drawPcbCopperPour, drawPcbCopperText, drawPcbCutout, drawPcbFabricationNotePath, drawPcbFabricationNoteRect, drawPcbFabricationNoteText, drawPcbHole, drawPcbNotePath, drawPcbNoteRect, drawPcbNoteText, drawPcbPlatedHole, drawPcbSilkscreenCircle, drawPcbSilkscreenLine, drawPcbSilkscreenPath, drawPcbSilkscreenRect, drawPcbSilkscreenText, drawPcbSmtPad, drawPcbTrace, drawPcbVia, drawPill, drawPolygon, drawRect, drawText, getAlphabetLayout, getTextStartPosition, strokeAlphabetText };

package/dist/index.js

@@ -819,7 +819,6 @@ var GLYPH_WIDTH_RATIO = 0.62;
 var LETTER_SPACING_RATIO = 0.3;
 var SPACE_WIDTH_RATIO = 1;
 var STROKE_WIDTH_RATIO = 0.13;
-var CURVED_GLYPHS = /* @__PURE__ */ new Set(["O", "o", "0"]);
 function getAlphabetLayout(text, fontSize) {
   const glyphWidth = fontSize * GLYPH_WIDTH_RATIO;
   const letterSpacing = glyphWidth * LETTER_SPACING_RATIO;
@@ -873,23 +872,7 @@ function strokeAlphabetText(ctx, text, layout, startX, startY) {
   characters.forEach((char, index) => {
     const lines = getGlyphLines(char);
     const advance = char === " " ? spaceWidth : glyphWidth;
-    if (CURVED_GLYPHS.has(char)) {
-      const normalizedCenterY = 0.5;
-      const centerY = topY + normalizedCenterY * height;
-      const radiusX = Math.max(glyphWidth / 2 - strokeWidth / 2, strokeWidth);
-      const radiusY = Math.max(height / 2 - strokeWidth / 2, strokeWidth);
-      ctx.beginPath();
-      ctx.ellipse(
-        cursor + glyphWidth / 2,
-        centerY,
-        radiusX,
-        radiusY,
-        0,
-        0,
-        Math.PI * 2
-      );
-      ctx.stroke();
-    } else if (lines?.length) {
+    if (lines?.length) {
       ctx.beginPath();
       for (const line of lines) {
         const x1 = cursor + line.x1 * glyphWidth;
@@ -1096,6 +1079,27 @@ function drawPcbFabricationNotePath(params) {
   }
 }
 
+// lib/drawer/elements/pcb-note-path.ts
+function drawPcbNotePath(params) {
+  const { ctx, path, transform, colorMap } = params;
+  const defaultColor = "rgb(89, 148, 220)";
+  const color = path.color ?? defaultColor;
+  if (!path.route || path.route.length < 2) return;
+  for (let i = 0; i < path.route.length - 1; i++) {
+    const start = path.route[i];
+    const end = path.route[i + 1];
+    if (!start || !end) continue;
+    drawLine({
+      ctx,
+      start: { x: start.x, y: start.y },
+      end: { x: end.x, y: end.y },
+      strokeWidth: path.stroke_width ?? 0.1,
+      stroke: color,
+      transform
+    });
+  }
+}
+
 // lib/drawer/elements/pcb-note-text.ts
 var DEFAULT_NOTE_TEXT_COLOR = "rgb(89, 148, 220)";
 function drawPcbNoteText(params) {
@@ -1328,6 +1332,14 @@ var CircuitToCanvasDrawer = class {
         colorMap: this.colorMap
       });
     }
+    if (element.type === "pcb_note_path") {
+      drawPcbNotePath({
+        ctx: this.ctx,
+        path: element,
+        transform: this.realToCanvasMat,
+        colorMap: this.colorMap
+      });
+    }
     if (element.type === "pcb_note_text") {
       drawPcbNoteText({
         ctx: this.ctx,
@@ -1353,6 +1365,7 @@ export {
   drawPcbFabricationNoteRect,
   drawPcbFabricationNoteText,
   drawPcbHole,
+  drawPcbNotePath,
   drawPcbNoteRect,
   drawPcbNoteText,
   drawPcbPlatedHole,

package/lib/drawer/CircuitToCanvasDrawer.ts

@@ -18,6 +18,7 @@ import type {
   PcbFabricationNoteRect,
   PcbNoteRect,
   PcbFabricationNotePath,
+  PcbNotePath,
   PcbNoteText,
 } from "circuit-json"
 import { identity, compose, translate, scale } from "transformation-matrix"
@@ -49,6 +50,7 @@ import { drawPcbFabricationNoteText } from "./elements/pcb-fabrication-note-text
 import { drawPcbFabricationNoteRect } from "./elements/pcb-fabrication-note-rect"
 import { drawPcbNoteRect } from "./elements/pcb-note-rect"
 import { drawPcbFabricationNotePath } from "./elements/pcb-fabrication-note-path"
+import { drawPcbNotePath } from "./elements/pcb-note-path"
 import { drawPcbNoteText } from "./elements/pcb-note-text"
 
 export interface DrawElementsOptions {
@@ -310,6 +312,15 @@ export class CircuitToCanvasDrawer {
       })
     }
 
+    if (element.type === "pcb_note_path") {
+      drawPcbNotePath({
+        ctx: this.ctx,
+        path: element as PcbNotePath,
+        transform: this.realToCanvasMat,
+        colorMap: this.colorMap,
+      })
+    }
+
     if (element.type === "pcb_note_text") {
       drawPcbNoteText({
         ctx: this.ctx,

package/lib/drawer/elements/index.ts

@@ -58,6 +58,11 @@ export {
   type DrawPcbFabricationNotePathParams,
 } from "./pcb-fabrication-note-path"
 
+export {
+  drawPcbNotePath,
+  type DrawPcbNotePathParams,
+} from "./pcb-note-path"
+
 export {
   drawPcbNoteText,
   type DrawPcbNoteTextParams,

package/lib/drawer/elements/pcb-note-path.ts

@@ -0,0 +1,39 @@
+import type { PcbNotePath } from "circuit-json"
+import type { Matrix } from "transformation-matrix"
+import type { PcbColorMap, CanvasContext } from "../types"
+import { drawLine } from "../shapes/line"
+
+export interface DrawPcbNotePathParams {
+  ctx: CanvasContext
+  path: PcbNotePath
+  transform: Matrix
+  colorMap: PcbColorMap
+}
+
+export function drawPcbNotePath(params: DrawPcbNotePathParams): void {
+  const { ctx, path, transform, colorMap } = params
+
+  // Use the color from the path if provided, otherwise use a default color
+  // Notes are typically shown in a distinct color
+  const defaultColor = "rgb(89, 148, 220)" // Blue color for notes
+  const color = path.color ?? defaultColor
+
+  if (!path.route || path.route.length < 2) return
+
+  // Draw each segment of the path
+  for (let i = 0; i < path.route.length - 1; i++) {
+    const start = path.route[i]
+    const end = path.route[i + 1]
+
+    if (!start || !end) continue
+
+    drawLine({
+      ctx,
+      start: { x: start.x, y: start.y },
+      end: { x: end.x, y: end.y },
+      strokeWidth: path.stroke_width ?? 0.1,
+      stroke: color,
+      transform,
+    })
+  }
+}

package/lib/drawer/shapes/text.ts

@@ -7,7 +7,6 @@ const GLYPH_WIDTH_RATIO = 0.62
 const LETTER_SPACING_RATIO = 0.3 // Letter spacing between characters (25% of glyph width)
 const SPACE_WIDTH_RATIO = 1
 const STROKE_WIDTH_RATIO = 0.13
-const CURVED_GLYPHS = new Set(["O", "o", "0"])
 
 export type AlphabetLayout = {
   width: number
@@ -125,23 +124,7 @@ export function strokeAlphabetText(
     const lines = getGlyphLines(char)
     const advance = char === " " ? spaceWidth : glyphWidth
 
-    if (CURVED_GLYPHS.has(char)) {
-      const normalizedCenterY = 0.5
-      const centerY = topY + normalizedCenterY * height
-      const radiusX = Math.max(glyphWidth / 2 - strokeWidth / 2, strokeWidth)
-      const radiusY = Math.max(height / 2 - strokeWidth / 2, strokeWidth)
-      ctx.beginPath()
-      ctx.ellipse(
-        cursor + glyphWidth / 2,
-        centerY,
-        radiusX,
-        radiusY,
-        0,
-        0,
-        Math.PI * 2,
-      )
-      ctx.stroke()
-    } else if (lines?.length) {
+    if (lines?.length) {
       ctx.beginPath()
       for (const line of lines) {
         // Convert normalized y coordinates to canvas coordinates (inverted for canvas)

package/package.json

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

package/tests/elements/pcb-note-path.test.ts

@@ -0,0 +1,34 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "canvas"
+import type { PcbNotePath } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw pcb note path", async () => {
+  const canvas = createCanvas(100, 100)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 100, 100)
+
+  const path: PcbNotePath = {
+    type: "pcb_note_path",
+    pcb_note_path_id: "note_path1",
+    route: [
+      { x: 10, y: 50 },
+      { x: 30, y: 20 },
+      { x: 70, y: 20 },
+      { x: 90, y: 50 },
+      { x: 70, y: 80 },
+      { x: 30, y: 80 },
+      { x: 10, y: 50 },
+    ],
+    stroke_width: 2,
+  }
+
+  drawer.drawElements([path])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})