circuit-to-canvas 0.0.14 → 0.0.15

package/lib/drawer/CircuitToCanvasDrawer.ts

@@ -156,7 +156,7 @@ export class CircuitToCanvasDrawer {
       drawPcbPlatedHole({
         ctx: this.ctx,
         hole: element as PcbPlatedHole,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -165,7 +165,7 @@ export class CircuitToCanvasDrawer {
       drawPcbVia({
         ctx: this.ctx,
         via: element as PCBVia,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -174,7 +174,7 @@ export class CircuitToCanvasDrawer {
       drawPcbHole({
         ctx: this.ctx,
         hole: element as PCBHole,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -183,7 +183,7 @@ export class CircuitToCanvasDrawer {
       drawPcbSmtPad({
         ctx: this.ctx,
         pad: element as PcbSmtPad,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -192,7 +192,7 @@ export class CircuitToCanvasDrawer {
       drawPcbTrace({
         ctx: this.ctx,
         trace: element as PCBTrace,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -201,7 +201,7 @@ export class CircuitToCanvasDrawer {
       drawPcbBoard({
         ctx: this.ctx,
         board: element as PcbBoard,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -210,7 +210,7 @@ export class CircuitToCanvasDrawer {
       drawPcbSilkscreenText({
         ctx: this.ctx,
         text: element as PcbSilkscreenText,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -219,7 +219,7 @@ export class CircuitToCanvasDrawer {
       drawPcbSilkscreenRect({
         ctx: this.ctx,
         rect: element as PcbSilkscreenRect,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -228,7 +228,7 @@ export class CircuitToCanvasDrawer {
       drawPcbSilkscreenCircle({
         ctx: this.ctx,
         circle: element as PcbSilkscreenCircle,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -237,7 +237,7 @@ export class CircuitToCanvasDrawer {
       drawPcbSilkscreenLine({
         ctx: this.ctx,
         line: element as PcbSilkscreenLine,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -246,7 +246,7 @@ export class CircuitToCanvasDrawer {
       drawPcbSilkscreenPath({
         ctx: this.ctx,
         path: element as PcbSilkscreenPath,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -255,7 +255,7 @@ export class CircuitToCanvasDrawer {
       drawPcbCutout({
         ctx: this.ctx,
         cutout: element as PcbCutout,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -264,7 +264,7 @@ export class CircuitToCanvasDrawer {
       drawPcbCopperPour({
         ctx: this.ctx,
         pour: element as PcbCopperPour,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -273,7 +273,7 @@ export class CircuitToCanvasDrawer {
       drawPcbCopperText({
         ctx: this.ctx,
         text: element as PcbCopperText,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -282,7 +282,7 @@ export class CircuitToCanvasDrawer {
       drawPcbFabricationNoteText({
         ctx: this.ctx,
         text: element as PcbFabricationNoteText,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -291,14 +291,14 @@ export class CircuitToCanvasDrawer {
       drawPcbFabricationNoteRect({
         ctx: this.ctx,
         rect: element as PcbFabricationNoteRect,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
 
     if (element.type === "pcb_note_rect") {
       drawPcbNoteRect({
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
         ctx: this.ctx,
         rect: element as PcbNoteRect,
@@ -309,7 +309,7 @@ export class CircuitToCanvasDrawer {
       drawPcbFabricationNotePath({
         ctx: this.ctx,
         path: element as PcbFabricationNotePath,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -318,7 +318,7 @@ export class CircuitToCanvasDrawer {
       drawPcbNotePath({
         ctx: this.ctx,
         path: element as PcbNotePath,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -327,7 +327,7 @@ export class CircuitToCanvasDrawer {
       drawPcbNoteText({
         ctx: this.ctx,
         text: element as PcbNoteText,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }
@@ -336,7 +336,7 @@ export class CircuitToCanvasDrawer {
       drawPcbNoteLine({
         ctx: this.ctx,
         line: element as PcbNoteLine,
-        transform: this.realToCanvasMat,
+        realToCanvasMat: this.realToCanvasMat,
         colorMap: this.colorMap,
       })
     }

package/lib/drawer/elements/pcb-board.ts

@@ -7,12 +7,12 @@ import { drawRect } from "../shapes/rect"
 export interface DrawPcbBoardParams {
   ctx: CanvasContext
   board: PcbBoard
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbBoard(params: DrawPcbBoardParams): void {
-  const { ctx, board, transform, colorMap } = params
+  const { ctx, board, realToCanvasMat, colorMap } = params
   const { width, height, center, outline } = board
 
   // If the board has a custom outline, draw it as a path
@@ -22,7 +22,7 @@ export function drawPcbBoard(params: DrawPcbBoardParams): void {
       points: outline.map((p) => ({ x: p.x, y: p.y })),
       stroke: colorMap.boardOutline,
       strokeWidth: 0.1,
-      transform,
+      realToCanvasMat,
       closePath: true,
     })
     return
@@ -37,7 +37,7 @@ export function drawPcbBoard(params: DrawPcbBoardParams): void {
       width,
       height,
       fill: "transparent",
-      transform,
+      realToCanvasMat,
     })
 
     // Draw the outline stroke separately using path
@@ -55,7 +55,7 @@ export function drawPcbBoard(params: DrawPcbBoardParams): void {
       points: corners,
       stroke: colorMap.boardOutline,
       strokeWidth: 0.1,
-      transform,
+      realToCanvasMat,
       closePath: true,
     })
   }

package/lib/drawer/elements/pcb-copper-pour.ts

@@ -8,7 +8,7 @@ import { drawPolygon } from "../shapes/polygon"
 export interface DrawPcbCopperPourParams {
   ctx: CanvasContext
   pour: PcbCopperPour
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
@@ -20,7 +20,7 @@ function layerToColor(layer: string, colorMap: PcbColorMap): string {
 }
 
 export function drawPcbCopperPour(params: DrawPcbCopperPourParams): void {
-  const { ctx, pour, transform, colorMap } = params
+  const { ctx, pour, realToCanvasMat, colorMap } = params
 
   const color = layerToColor(pour.layer, colorMap)
 
@@ -29,9 +29,12 @@ export function drawPcbCopperPour(params: DrawPcbCopperPourParams): void {
 
   if (pour.shape === "rect") {
     // Draw the copper pour rectangle with 50% opacity
-    const [cx, cy] = applyToPoint(transform, [pour.center.x, pour.center.y])
-    const scaledWidth = pour.width * Math.abs(transform.a)
-    const scaledHeight = pour.height * Math.abs(transform.a)
+    const [cx, cy] = applyToPoint(realToCanvasMat, [
+      pour.center.x,
+      pour.center.y,
+    ])
+    const scaledWidth = pour.width * Math.abs(realToCanvasMat.a)
+    const scaledHeight = pour.height * Math.abs(realToCanvasMat.a)
 
     ctx.translate(cx, cy)
 
@@ -50,11 +53,11 @@ export function drawPcbCopperPour(params: DrawPcbCopperPourParams): void {
 
   if (pour.shape === "polygon") {
     if (pour.points && pour.points.length >= 3) {
-      const transformedPoints = pour.points.map((p: { x: number; y: number }) =>
-        applyToPoint(transform, [p.x, p.y]),
+      const canvasPoints = pour.points.map((p: { x: number; y: number }) =>
+        applyToPoint(realToCanvasMat, [p.x, p.y]),
       )
 
-      const firstPoint = transformedPoints[0]
+      const firstPoint = canvasPoints[0]
       if (!firstPoint) {
         ctx.restore()
         return
@@ -64,8 +67,8 @@ export function drawPcbCopperPour(params: DrawPcbCopperPourParams): void {
       const [firstX, firstY] = firstPoint
       ctx.moveTo(firstX, firstY)
 
-      for (let i = 1; i < transformedPoints.length; i++) {
-        const point = transformedPoints[i]
+      for (let i = 1; i < canvasPoints.length; i++) {
+        const point = canvasPoints[i]
         if (!point) continue
         const [x, y] = point
         ctx.lineTo(x, y)

package/lib/drawer/elements/pcb-copper-text.ts

@@ -12,7 +12,7 @@ import {
 export interface DrawPcbCopperTextParams {
   ctx: CanvasContext
   text: PcbCopperText
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
@@ -33,16 +33,16 @@ function mapAnchorAlignment(alignment?: string): AnchorAlignment {
 }
 
 export function drawPcbCopperText(params: DrawPcbCopperTextParams): void {
-  const { ctx, text, transform, colorMap } = params
+  const { ctx, text, realToCanvasMat, colorMap } = params
 
   const content = text.text ?? ""
   if (!content) return
 
-  const [x, y] = applyToPoint(transform, [
+  const [x, y] = applyToPoint(realToCanvasMat, [
     text.anchor_position.x,
     text.anchor_position.y,
   ])
-  const scale = Math.abs(transform.a)
+  const scale = Math.abs(realToCanvasMat.a)
   const fontSize = (text.font_size ?? 1) * scale
   const rotation = text.ccw_rotation ?? 0
   const padding = {

package/lib/drawer/elements/pcb-cutout.ts

@@ -8,12 +8,12 @@ import { drawPolygon } from "../shapes/polygon"
 export interface DrawPcbCutoutParams {
   ctx: CanvasContext
   cutout: PcbCutout
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbCutout(params: DrawPcbCutoutParams): void {
-  const { ctx, cutout, transform, colorMap } = params
+  const { ctx, cutout, realToCanvasMat, colorMap } = params
 
   if (cutout.shape === "rect") {
     drawRect({
@@ -22,7 +22,7 @@ export function drawPcbCutout(params: DrawPcbCutoutParams): void {
       width: cutout.width,
       height: cutout.height,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
       rotation: cutout.rotation ?? 0,
     })
     return
@@ -34,7 +34,7 @@ export function drawPcbCutout(params: DrawPcbCutoutParams): void {
       center: cutout.center,
       radius: cutout.radius,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
     })
     return
   }
@@ -45,7 +45,7 @@ export function drawPcbCutout(params: DrawPcbCutoutParams): void {
         ctx,
         points: cutout.points,
         fill: colorMap.drill,
-        transform,
+        realToCanvasMat,
       })
     }
     return

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

@@ -6,14 +6,14 @@ import { drawLine } from "../shapes/line"
 export interface DrawPcbFabricationNotePathParams {
   ctx: CanvasContext
   path: PcbFabricationNotePath
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbFabricationNotePath(
   params: DrawPcbFabricationNotePathParams,
 ): void {
-  const { ctx, path, transform, colorMap } = params
+  const { ctx, path, realToCanvasMat, colorMap } = params
 
   // Use the color from the path if provided, otherwise use a default color
   // Fabrication notes are typically shown in a distinct color
@@ -35,7 +35,7 @@ export function drawPcbFabricationNotePath(
       end: { x: end.x, y: end.y },
       strokeWidth: path.stroke_width ?? 0.1,
       stroke: color,
-      transform,
+      realToCanvasMat,
     })
   }
 }

package/lib/drawer/elements/pcb-fabrication-note-rect.ts

@@ -6,14 +6,14 @@ import { drawRect } from "../shapes/rect"
 export interface DrawPcbFabricationNoteRectParams {
   ctx: CanvasContext
   rect: PcbFabricationNoteRect
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbFabricationNoteRect(
   params: DrawPcbFabricationNoteRectParams,
 ): void {
-  const { ctx, rect, transform, colorMap } = params
+  const { ctx, rect, realToCanvasMat, colorMap } = params
 
   // Use the color from the rect if provided, otherwise use a default color
   // Fabrication notes are typically shown in a distinct color
@@ -33,7 +33,7 @@ export function drawPcbFabricationNoteRect(
     stroke: hasStroke ? color : undefined,
     strokeWidth: hasStroke ? rect.stroke_width : undefined,
     borderRadius: rect.corner_radius,
-    transform,
+    realToCanvasMat,
     isStrokeDashed,
   })
 }

package/lib/drawer/elements/pcb-fabrication-note-text.ts

@@ -6,7 +6,7 @@ import { drawText } from "../shapes/text"
 export interface DrawPcbFabricationNoteTextParams {
   ctx: CanvasContext
   text: PcbFabricationNoteText
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
@@ -21,14 +21,14 @@ function layerToColor(layer: string, colorMap: PcbColorMap): string {
 export function drawPcbFabricationNoteText(
   params: DrawPcbFabricationNoteTextParams,
 ): void {
-  const { ctx, text, transform, colorMap } = params
+  const { ctx, text, realToCanvasMat, colorMap } = params
 
   const defaultColor = layerToColor(text.layer, colorMap)
   const color = text.color ?? defaultColor
   const fontSize = text.font_size
 
   // Use @tscircuit/alphabet to draw text
-  // Pass real-world coordinates and let drawText apply the transform
+  // Pass real-world coordinates and let drawText apply the realToCanvasMat
   drawText({
     ctx,
     text: text.text,
@@ -36,7 +36,7 @@ export function drawPcbFabricationNoteText(
     y: text.anchor_position.y,
     fontSize,
     color,
-    transform,
+    realToCanvasMat,
     anchorAlignment: text.anchor_alignment,
   })
 }

package/lib/drawer/elements/pcb-hole.ts

@@ -9,12 +9,12 @@ import { drawPill } from "../shapes/pill"
 export interface DrawPcbHoleParams {
   ctx: CanvasContext
   hole: PCBHole
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbHole(params: DrawPcbHoleParams): void {
-  const { ctx, hole, transform, colorMap } = params
+  const { ctx, hole, realToCanvasMat, colorMap } = params
 
   if (hole.hole_shape === "circle") {
     drawCircle({
@@ -22,7 +22,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       center: { x: hole.x, y: hole.y },
       radius: hole.hole_diameter / 2,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
     })
     return
   }
@@ -34,7 +34,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       width: hole.hole_diameter,
       height: hole.hole_diameter,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
     })
     return
   }
@@ -46,7 +46,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       width: hole.hole_width,
       height: hole.hole_height,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
     })
     return
   }
@@ -58,7 +58,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       width: hole.hole_width,
       height: hole.hole_height,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
     })
     return
   }
@@ -70,7 +70,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       width: hole.hole_width,
       height: hole.hole_height,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
     })
     return
   }
@@ -82,7 +82,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       width: hole.hole_width,
       height: hole.hole_height,
       fill: colorMap.drill,
-      transform,
+      realToCanvasMat,
       rotation: (hole as any).ccw_rotation ?? 0,
     })
     return

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

@@ -6,12 +6,12 @@ import type { PcbColorMap, CanvasContext } from "../types"
 export interface DrawPcbNoteLineParams {
   ctx: CanvasContext
   line: PcbNoteLine
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbNoteLine(params: DrawPcbNoteLineParams): void {
-  const { ctx, line, transform, colorMap } = params
+  const { ctx, line, realToCanvasMat, colorMap } = params
 
   // Use the color from the line if provided, otherwise use a default color
   // Notes are typically shown in a distinct color
@@ -21,9 +21,9 @@ export function drawPcbNoteLine(params: DrawPcbNoteLineParams): void {
   const strokeWidth = line.stroke_width ?? 0.1
   const isDashed = line.is_dashed ?? false
 
-  const [x1, y1] = applyToPoint(transform, [line.x1, line.y1])
-  const [x2, y2] = applyToPoint(transform, [line.x2, line.y2])
-  const scaledStrokeWidth = strokeWidth * Math.abs(transform.a)
+  const [x1, y1] = applyToPoint(realToCanvasMat, [line.x1, line.y1])
+  const [x2, y2] = applyToPoint(realToCanvasMat, [line.x2, line.y2])
+  const scaledStrokeWidth = strokeWidth * Math.abs(realToCanvasMat.a)
 
   ctx.save()
 

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

@@ -6,12 +6,12 @@ import { drawLine } from "../shapes/line"
 export interface DrawPcbNotePathParams {
   ctx: CanvasContext
   path: PcbNotePath
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbNotePath(params: DrawPcbNotePathParams): void {
-  const { ctx, path, transform, colorMap } = params
+  const { ctx, path, realToCanvasMat, colorMap } = params
 
   // Use the color from the path if provided, otherwise use a default color
   // Notes are typically shown in a distinct color
@@ -33,7 +33,7 @@ export function drawPcbNotePath(params: DrawPcbNotePathParams): void {
       end: { x: end.x, y: end.y },
       strokeWidth: path.stroke_width ?? 0.1,
       stroke: color,
-      transform,
+      realToCanvasMat,
     })
   }
 }

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

@@ -6,12 +6,12 @@ import { drawRect } from "../shapes/rect"
 export interface DrawPcbNoteRectParams {
   ctx: CanvasContext
   rect: PcbNoteRect
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 export function drawPcbNoteRect(params: DrawPcbNoteRectParams): void {
-  const { ctx, rect, transform, colorMap } = params
+  const { ctx, rect, realToCanvasMat, colorMap } = params
 
   // Use the color from the rect if provided, otherwise use a default color
   // Notes are typically shown in a distinct color
@@ -31,7 +31,7 @@ export function drawPcbNoteRect(params: DrawPcbNoteRectParams): void {
     stroke: hasStroke ? color : undefined,
     strokeWidth: hasStroke ? rect.stroke_width : undefined,
     borderRadius: rect.corner_radius,
-    transform,
+    realToCanvasMat,
     isStrokeDashed,
   })
 }

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

@@ -6,21 +6,21 @@ import { drawText } from "../shapes/text"
 export interface DrawPcbNoteTextParams {
   ctx: CanvasContext
   text: PcbNoteText
-  transform: Matrix
+  realToCanvasMat: Matrix
   colorMap: PcbColorMap
 }
 
 const DEFAULT_NOTE_TEXT_COLOR = "rgb(89, 148, 220)" // Same color as note rect
 
 export function drawPcbNoteText(params: DrawPcbNoteTextParams): void {
-  const { ctx, text, transform, colorMap } = params
+  const { ctx, text, realToCanvasMat, colorMap } = params
 
   const defaultColor = DEFAULT_NOTE_TEXT_COLOR
   const color = text.color ?? defaultColor
   const fontSize = text.font_size ?? 1 // Default to 1mm if not provided
 
   // Use @tscircuit/alphabet to draw text
-  // Pass real-world coordinates and let drawText apply the transform
+  // Pass real-world coordinates and let drawText apply the realToCanvasMat
   drawText({
     ctx,
     text: text.text ?? "",
@@ -28,7 +28,7 @@ export function drawPcbNoteText(params: DrawPcbNoteTextParams): void {
     y: text.anchor_position.y,
     fontSize,
     color,
-    transform,
+    realToCanvasMat,
     anchorAlignment: text.anchor_alignment ?? "center",
   })
 }