up in 1mm

Author: techmannih

src/convert-kicad-json-to-tscircuit-soup.ts

@@ -620,7 +620,7 @@ export const convertKicadJsonToTsCircuitSoup = async (
             const mid = makePoint(segment.mid)
             const end = makePoint(segment.end)
             const arcLength = getArcLength(start, mid, end)
-            const numPoints = Math.max(8, Math.ceil(arcLength * 10))
+            const numPoints = Math.max(8, Math.ceil(arcLength))
             const arcPoints = generateArcPath(start, mid, end, numPoints).map(
               (p) => ({
                 x: p.x,
@@ -632,7 +632,35 @@ export const convertKicadJsonToTsCircuitSoup = async (
                 arcPoints.shift()
               }
             }
-            for (const point of arcPoints) {
+            const adjustedNumPoints = Math.max(2, Math.ceil(arcLength / 0.1))
+            const arcPointsAdjusted = generateArcPath(
+              start,
+              mid,
+              end,
+              adjustedNumPoints,
+            ).map((p) => ({
+              x: p.x,
+              y: -p.y,
+            }))
+
+            if (arcPointsAdjusted.length > 0 && route.length > 0) {
+              if (
+                pointsAreClose(route[route.length - 1]!, arcPointsAdjusted[0]!)
+              ) {
+                arcPointsAdjusted.shift()
+              }
+            }
+            for (let i = 0; i < arcPointsAdjusted.length - 1; i++) {
+              const p0 = arcPointsAdjusted[i]!
+              const p1 = arcPointsAdjusted[i + 1]!
+              const dx = p1.x - p0.x
+              const dy = p1.y - p0.y
+              const segmentArcLength = Math.sqrt(dx * dx + dy * dy)
+              console.log(`Segment ${i} length:`, segmentArcLength)
+            }
+            //  now refactor the code to use arcPointsAdjusted
+
+            for (const point of arcPointsAdjusted) {
               pushRoutePoint(point)
             }
           }

tests/data/viaGrid-pacman-1mm.kicad_mod

@@ -0,0 +1,36 @@
+(footprint "viaGrid-pacman-1mm"
+  (version 20241229)
+  (generator "pcbnew")
+  (generator_version "9.0")
+  (layer "F.Cu")
+  (property "Reference" "REF**"
+    (at 0 -0.25 0)
+    (unlocked yes)
+    (layer "F.SilkS")
+    (hide yes)
+    (effects (font (size 0.25 0.25) (thickness 0.05)))
+  )
+  (property "Value" "viaGrid-pacman-1mm"
+    (at 0 0.5 0)
+    (unlocked yes)
+    (layer "F.Fab")
+    (hide yes)
+    (effects (font (size 0.25 0.25) (thickness 0.05)))
+  )
+  (attr smd)
+  (fp_poly
+    (pts
+      (xy 0.5 0.04)
+      (xy -0.04 0.04)
+      (xy -0.039999 -0.5)
+      (arc
+        (start -0.04 -0.5)
+        (mid -0.354683 0.354683)
+        (end 0.5 0.04)
+      )
+    )
+    (stroke (width 0) (type solid))
+    (fill yes)
+    (layer "F.Cu")
+  )
+)

tests/repros/__snapshots__/fp-poly-arc-1mm-loading.snap.svg

@@ -0,0 +1,33 @@
+import { test, expect } from "bun:test"
+import { parseKicadModToCircuitJson } from "src"
+import fs from "fs"
+import { join } from "path"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+
+test("fp_poly with arc segments loads without NaNs", async () => {
+  const fixturePath = join(
+    import.meta.dirname,
+    "..",
+    "data",
+    "viaGrid-pacman-1mm.kicad_mod",
+  )
+  const fileContent = fs.readFileSync(fixturePath, "utf-8")
+
+  const circuitJson = await parseKicadModToCircuitJson(fileContent)
+  const result = convertCircuitJsonToPcbSvg(circuitJson as any)
+  // validate the segment length should be around 0.1mm
+  const arcSegments = result.match(/<path d="([^"]+)"/g) || []
+  for (const pathTag of arcSegments) {
+    const dAttrMatch = pathTag.match(/<path d="([^"]+)"/)
+    if (!dAttrMatch) continue
+    const dAttr = dAttrMatch[1]
+    const commands = dAttr.match(/[ML][^ML]+/g) || []
+    for (let i = 1; i < commands.length; i++) {
+      const [x1, y1] = commands[i - 1].slice(1).trim().split(" ").map(Number)
+      const [x2, y2] = commands[i].slice(1).trim().split(" ").map(Number)
+      const segmentLength = Math.sqrt((x2 - x1) ** 2 + (y2 - y1) ** 2)
+      expect(segmentLength).toBeLessThanOrEqual(0.1) // allow small tolerance
+    }
+  }
+  expect(result).toMatchSvgSnapshot(import.meta.path)
+})

tests/repros/fp-poly-arc-1mm-loading.test.ts

@@ -15,5 +15,19 @@ test("fp_poly with arc segments loads without NaNs", async () => {
 
   const circuitJson = await parseKicadModToCircuitJson(fileContent)
   const result = convertCircuitJsonToPcbSvg(circuitJson as any)
+  // validate the segment length should be around 0.1mm
+  const arcSegments = result.match(/<path d="([^"]+)"/g) || []
+  for (const pathTag of arcSegments) {
+    const dAttrMatch = pathTag.match(/<path d="([^"]+)"/)
+    if (!dAttrMatch) continue
+    const dAttr = dAttrMatch[1]
+    const commands = dAttr.match(/[ML][^ML]+/g) || []
+    for (let i = 1; i < commands.length; i++) {
+      const [x1, y1] = commands[i - 1].slice(1).trim().split(" ").map(Number)
+      const [x2, y2] = commands[i].slice(1).trim().split(" ").map(Number)
+      const segmentLength = Math.sqrt((x2 - x1) ** 2 + (y2 - y1) ** 2)
+      expect(segmentLength).toBeLessThanOrEqual(0.1) // allow small tolerance
+    }
+  }
   expect(result).toMatchSvgSnapshot(import.meta.path)
 })