circuit-to-canvas 0.0.97 → 0.0.99

package/dist/index.js

@@ -209,10 +209,6 @@ function drawPolygon(params) {
 function layerToColor(layer, colorMap) {
   return colorMap.copper[layer] ?? colorMap.copper.top;
 }
-function layerToPourOpacity(layer) {
-  if (layer === "top" || layer === "bottom") return 0.5;
-  return 1;
-}
 function computeArcFromBulge(startX, startY, endX, endY, bulge) {
   if (Math.abs(bulge) < 1e-10) {
     return null;
@@ -338,7 +334,7 @@ function drawRing(ctx, ring, realToCanvasMat) {
 function drawPcbCopperPour(params) {
   const { ctx, pour, realToCanvasMat, colorMap } = params;
   const color = layerToColor(pour.layer, colorMap);
-  const opacity = layerToPourOpacity(pour.layer);
+  const opacity = 0.5;
   ctx.save();
   ctx.globalAlpha = opacity;
   if (pour.shape === "rect") {

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

@@ -20,11 +20,6 @@ function layerToColor(layer: string, colorMap: PcbColorMap): string {
   )
 }
 
-function layerToPourOpacity(layer: string): number {
-  if (layer === "top" || layer === "bottom") return 0.5
-  return 1
-}
-
 /**
  * Compute arc center and radius from two points and a bulge value.
  * Bulge is the tangent of 1/4 of the included angle.
@@ -242,7 +237,7 @@ export function drawPcbCopperPour(params: DrawPcbCopperPourParams): void {
   const { ctx, pour, realToCanvasMat, colorMap } = params
 
   const color = layerToColor(pour.layer, colorMap)
-  const opacity = layerToPourOpacity(pour.layer)
+  const opacity = 0.5
 
   // Save context to apply opacity
   ctx.save()

package/package.json

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

package/tests/elements/pcb-copper-pour-inner-layers.test.ts

@@ -0,0 +1,92 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import type { AnyCircuitElement } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+function renderCopperPourScene(elements: AnyCircuitElement[]): Buffer {
+  const canvas = createCanvas(100, 100)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 100, 100)
+
+  drawer.drawElements(elements)
+
+  return canvas.toBuffer("image/png")
+}
+
+const INNER_LAYERS = [
+  "inner1",
+  "inner2",
+  "inner3",
+  "inner4",
+  "inner5",
+  "inner6",
+] as const
+
+function createCopperPourWithTraceScene(
+  layer: (typeof INNER_LAYERS)[number],
+): AnyCircuitElement[] {
+  return [
+    {
+      type: "pcb_copper_pour" as const,
+      pcb_copper_pour_id: `pour_${layer}`,
+      shape: "polygon" as const,
+      layer,
+      points: [
+        { x: 10, y: 10 },
+        { x: 90, y: 10 },
+        { x: 90, y: 90 },
+        { x: 10, y: 90 },
+      ],
+      covered_with_solder_mask: false,
+    },
+    {
+      type: "pcb_trace" as const,
+      pcb_trace_id: `trace_${layer}`,
+      route: [
+        {
+          route_type: "wire" as const,
+          x: 20,
+          y: 50,
+          width: 5,
+          layer,
+        },
+        {
+          route_type: "wire" as const,
+          x: 80,
+          y: 50,
+          width: 5,
+          layer,
+        },
+      ],
+    },
+    {
+      type: "pcb_via" as const,
+      pcb_via_id: `via_${layer}`,
+      x: 50,
+      y: 50,
+      outer_diameter: 15,
+      hole_diameter: 8,
+      layers: ["top", ...INNER_LAYERS, "bottom"],
+    },
+  ]
+}
+
+for (const layer of INNER_LAYERS) {
+  test(`draw ${layer} copper pour with trace`, async () => {
+    const elements = createCopperPourWithTraceScene(layer)
+
+    const withTrace = renderCopperPourScene(elements)
+    const withoutTrace = renderCopperPourScene(
+      elements.filter((element) => element.type !== "pcb_trace"),
+    )
+
+    expect(Buffer.compare(withTrace, withoutTrace)).not.toBe(0)
+    await expect(withTrace).toMatchPngSnapshot(
+      import.meta.path,
+      `${layer}-copper-pour-with-trace`,
+    )
+  })
+}