@tscircuit/schematic-trace-solver 0.0.86 → 0.0.87

package/dist/index.js

@@ -5777,6 +5777,57 @@ var getPointDistanceFromRect = (point, rect) => {
   return dx + dy;
 };
 
+// lib/solvers/Example28Solver/countCrossingsWithOtherTraces.ts
+var countCrossingsWithOtherTraces = (params) => {
+  const { trace, outputTraces } = params;
+  let crossingCount = 0;
+  for (const otherTrace of outputTraces) {
+    if (otherTrace.mspPairId === trace.mspPairId) continue;
+    if (otherTrace.globalConnNetId === trace.globalConnNetId) continue;
+    crossingCount += countPathIntersections(
+      trace.tracePath,
+      otherTrace.tracePath
+    );
+  }
+  return crossingCount;
+};
+
+// lib/solvers/Example28Solver/doesPathRunAlongChipBoundary.ts
+var doesPathRunAlongChipBoundary = (path, chipObstacles) => {
+  for (let i = 0; i < path.length - 1; i++) {
+    const start = path[i];
+    const end = path[i + 1];
+    for (const obstacle of chipObstacles) {
+      if (!segmentRunsAlongRectBoundary(start, end, obstacle)) continue;
+      if (getSegmentOverlapWithRectSpan(start, end, obstacle) > EPS7) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+var getSegmentOverlapWithRectSpan = (start, end, rect) => {
+  const isVertical4 = Math.abs(start.x - end.x) < EPS7;
+  if (isVertical4) {
+    return Math.min(Math.max(start.y, end.y), rect.maxY) - Math.max(Math.min(start.y, end.y), rect.minY);
+  }
+  return Math.min(Math.max(start.x, end.x), rect.maxX) - Math.max(Math.min(start.x, end.x), rect.minX);
+};
+
+// lib/solvers/Example28Solver/scoreSolutionTracePath.ts
+var scoreSolutionTracePath = (params) => {
+  const { traces, outputTraces, chipObstacles } = params;
+  let chipEdgeRuns = 0;
+  let traceCrossings = 0;
+  for (const trace of traces) {
+    if (doesPathRunAlongChipBoundary(trace.tracePath, chipObstacles)) {
+      chipEdgeRuns += 1;
+    }
+    traceCrossings += countCrossingsWithOtherTraces({ trace, outputTraces });
+  }
+  return { chipEdgeRuns, traceCrossings };
+};
+
 // lib/solvers/Example28Solver/visualize.ts
 var CANDIDATE_SELECTED_COLOR = "blue";
 var CANDIDATE_REJECTED_COLOR = "red";
@@ -5849,6 +5900,13 @@ ${label.netId ?? label.globalConnNetId}`
 var LABEL_OUTWARD_STEP = 0.1;
 var LABEL_MAX_OUTWARD_STEPS = 10;
 var LABEL_TRACE_CLEARANCE = 0.1;
+var isScoreBetter = (rerouteScore, labelMoveScore) => {
+  if (!rerouteScore) return false;
+  if (rerouteScore.chipEdgeRuns !== labelMoveScore.chipEdgeRuns) {
+    return rerouteScore.chipEdgeRuns < labelMoveScore.chipEdgeRuns;
+  }
+  return rerouteScore.traceCrossings < labelMoveScore.traceCrossings;
+};
 var Example28Solver = class extends BaseSolver {
   inputProblem;
   traces;
@@ -5951,7 +6009,7 @@ var Example28Solver = class extends BaseSolver {
     );
     if (traceIndex === -1) return;
     const currentTrace = this.outputTraces[traceIndex];
-    if (this.tryMoveLabelOutward(overlap.label)) return;
+    const labelMove = this.tryMoveLabelOutward(overlap.label);
     const rerouteResult = findBestReroutePath({
       trace: currentTrace,
       obstacleLabel: overlap.label,
@@ -5961,6 +6019,26 @@ var Example28Solver = class extends BaseSolver {
       chipObstacles: this.chipObstacles
     });
     this.currentCandidateResults = rerouteResult.candidateResults;
+    let rerouteScore = null;
+    if (rerouteResult.bestPath) {
+      rerouteScore = scoreSolutionTracePath({
+        traces: [{ ...currentTrace, tracePath: rerouteResult.bestPath }],
+        outputTraces: this.outputTraces,
+        chipObstacles: this.chipObstacles
+      });
+    }
+    if (labelMove) {
+      const labelMoveScore = scoreSolutionTracePath({
+        traces: [labelMove.connectorTrace, currentTrace],
+        outputTraces: this.outputTraces,
+        chipObstacles: this.chipObstacles
+      });
+      if (!isScoreBetter(rerouteScore, labelMoveScore)) {
+        this.outputNetLabelPlacements[labelMove.labelIndex] = labelMove.movedLabel;
+        this.outputTraces.push(labelMove.connectorTrace);
+        return;
+      }
+    }
     if (!rerouteResult.bestPath) return;
     const originalTracePath = currentTrace.tracePath;
     this.outputTraces[traceIndex] = {
@@ -5978,17 +6056,17 @@ var Example28Solver = class extends BaseSolver {
     const labelIndex = this.outputNetLabelPlacements.findIndex(
       (label2) => label2.globalConnNetId === labelToMove.globalConnNetId && label2.anchorPoint.x === labelToMove.anchorPoint.x && label2.anchorPoint.y === labelToMove.anchorPoint.y && label2.pinIds.join(",") === labelToMove.pinIds.join(",")
     );
-    if (labelIndex === -1) return false;
+    if (labelIndex === -1) return null;
     const label = this.outputNetLabelPlacements[labelIndex];
-    if (label.mspConnectionPairIds.length > 0) return false;
-    if (label.pinIds.length !== 1) return false;
+    if (label.mspConnectionPairIds.length > 0) return null;
+    if (label.pinIds.length !== 1) return null;
     if (this.outputNetLabelPlacements.filter(
       (otherLabel) => otherLabel.globalConnNetId === label.globalConnNetId
     ).length !== 1) {
-      return false;
+      return null;
     }
     const outward = dir(label.orientation);
-    if (outward.x === 0 && outward.y === 0) return false;
+    if (outward.x === 0 && outward.y === 0) return null;
     for (let step = 1; step <= LABEL_MAX_OUTWARD_STEPS; step++) {
       const distance3 = step * LABEL_OUTWARD_STEP;
       const candidate = {
@@ -6024,11 +6102,9 @@ var Example28Solver = class extends BaseSolver {
       }).length > 0) {
         continue;
       }
-      this.outputNetLabelPlacements[labelIndex] = candidate;
-      this.outputTraces.push(connectorTrace);
-      return true;
+      return { labelIndex, movedLabel: candidate, connectorTrace };
     }
-    return false;
+    return null;
   }
   visualize() {
     return visualizeExample28Solver({

package/lib/solvers/Example28Solver/Example28Solver.ts

@@ -20,6 +20,10 @@ import type {
 import { dir } from "lib/utils/dir"
 import { moveAttachedLabelsToReroutedTrace } from "./labelMovement"
 import { findBestReroutePath } from "./reroute"
+import {
+  scoreSolutionTracePath,
+  type TracePathScore,
+} from "./scoreSolutionTracePath"
 import type { Example28SolverParams, RerouteCandidateResult } from "./types"
 import { visualizeExample28Solver } from "./visualize"
 
@@ -27,6 +31,17 @@ const LABEL_OUTWARD_STEP = 0.1
 const LABEL_MAX_OUTWARD_STEPS = 10
 const LABEL_TRACE_CLEARANCE = 0.1
 
+const isScoreBetter = (
+  rerouteScore: TracePathScore | null,
+  labelMoveScore: TracePathScore,
+) => {
+  if (!rerouteScore) return false
+  if (rerouteScore.chipEdgeRuns !== labelMoveScore.chipEdgeRuns) {
+    return rerouteScore.chipEdgeRuns < labelMoveScore.chipEdgeRuns
+  }
+  return rerouteScore.traceCrossings < labelMoveScore.traceCrossings
+}
+
 export class Example28Solver extends BaseSolver {
   inputProblem: InputProblem
   traces: SolvedTracePath[]
@@ -160,7 +175,7 @@ export class Example28Solver extends BaseSolver {
     if (traceIndex === -1) return
 
     const currentTrace = this.outputTraces[traceIndex]!
-    if (this.tryMoveLabelOutward(overlap.label)) return
+    const labelMove = this.tryMoveLabelOutward(overlap.label)
 
     const rerouteResult = findBestReroutePath({
       trace: currentTrace,
@@ -172,6 +187,29 @@ export class Example28Solver extends BaseSolver {
     })
     this.currentCandidateResults = rerouteResult.candidateResults
 
+    let rerouteScore: TracePathScore | null = null
+    if (rerouteResult.bestPath) {
+      rerouteScore = scoreSolutionTracePath({
+        traces: [{ ...currentTrace, tracePath: rerouteResult.bestPath }],
+        outputTraces: this.outputTraces,
+        chipObstacles: this.chipObstacles,
+      })
+    }
+
+    if (labelMove) {
+      const labelMoveScore = scoreSolutionTracePath({
+        traces: [labelMove.connectorTrace, currentTrace],
+        outputTraces: this.outputTraces,
+        chipObstacles: this.chipObstacles,
+      })
+      if (!isScoreBetter(rerouteScore, labelMoveScore)) {
+        this.outputNetLabelPlacements[labelMove.labelIndex] =
+          labelMove.movedLabel
+        this.outputTraces.push(labelMove.connectorTrace)
+        return
+      }
+    }
+
     if (!rerouteResult.bestPath) return
 
     const originalTracePath = currentTrace.tracePath
@@ -195,21 +233,21 @@ export class Example28Solver extends BaseSolver {
         label.anchorPoint.y === labelToMove.anchorPoint.y &&
         label.pinIds.join(",") === labelToMove.pinIds.join(","),
     )
-    if (labelIndex === -1) return false
+    if (labelIndex === -1) return null
 
     const label = this.outputNetLabelPlacements[labelIndex]!
-    if (label.mspConnectionPairIds.length > 0) return false
-    if (label.pinIds.length !== 1) return false
+    if (label.mspConnectionPairIds.length > 0) return null
+    if (label.pinIds.length !== 1) return null
     if (
       this.outputNetLabelPlacements.filter(
         (otherLabel) => otherLabel.globalConnNetId === label.globalConnNetId,
       ).length !== 1
     ) {
-      return false
+      return null
     }
 
     const outward = dir(label.orientation)
-    if (outward.x === 0 && outward.y === 0) return false
+    if (outward.x === 0 && outward.y === 0) return null
 
     for (let step = 1; step <= LABEL_MAX_OUTWARD_STEPS; step++) {
       const distance = step * LABEL_OUTWARD_STEP
@@ -252,12 +290,10 @@ export class Example28Solver extends BaseSolver {
         continue
       }
 
-      this.outputNetLabelPlacements[labelIndex] = candidate
-      this.outputTraces.push(connectorTrace)
-      return true
+      return { labelIndex, movedLabel: candidate, connectorTrace }
     }
 
-    return false
+    return null
   }
 
   override visualize(): GraphicsObject {

package/lib/solvers/Example28Solver/countCrossingsWithOtherTraces.ts

@@ -0,0 +1,19 @@
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+import { countPathIntersections } from "./geometry"
+
+export const countCrossingsWithOtherTraces = (params: {
+  trace: SolvedTracePath
+  outputTraces: SolvedTracePath[]
+}) => {
+  const { trace, outputTraces } = params
+  let crossingCount = 0
+  for (const otherTrace of outputTraces) {
+    if (otherTrace.mspPairId === trace.mspPairId) continue
+    if (otherTrace.globalConnNetId === trace.globalConnNetId) continue
+    crossingCount += countPathIntersections(
+      trace.tracePath,
+      otherTrace.tracePath,
+    )
+  }
+  return crossingCount
+}

package/lib/solvers/Example28Solver/scoreSolutionTracePath.ts

@@ -0,0 +1,26 @@
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+import { countCrossingsWithOtherTraces } from "./countCrossingsWithOtherTraces"
+import { doesPathRunAlongChipBoundary } from "./doesPathRunAlongChipBoundary"
+import type { ChipObstacle } from "./types"
+
+export type TracePathScore = {
+  chipEdgeRuns: number
+  traceCrossings: number
+}
+
+export const scoreSolutionTracePath = (params: {
+  traces: SolvedTracePath[]
+  outputTraces: SolvedTracePath[]
+  chipObstacles: ChipObstacle[]
+}): TracePathScore => {
+  const { traces, outputTraces, chipObstacles } = params
+  let chipEdgeRuns = 0
+  let traceCrossings = 0
+  for (const trace of traces) {
+    if (doesPathRunAlongChipBoundary(trace.tracePath, chipObstacles)) {
+      chipEdgeRuns += 1
+    }
+    traceCrossings += countCrossingsWithOtherTraces({ trace, outputTraces })
+  }
+  return { chipEdgeRuns, traceCrossings }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/tests/examples/__snapshots__/example50.snap.svg

@@ -2,139 +2,133 @@
   <rect width="100%" height="100%" fill="white" />
   <g>
     <circle data-type="point" data-label="R7.1
-x-" data-x="-1.95" data-y="-6.6" cx="122.2014128470511" cy="219.67471660916704" r="3" fill="hsl(232, 100%, 50%, 0.8)" />
+x-" data-x="-1.95" data-y="-6.6" cx="126.46276136167273" cy="214.47382063245198" r="3" fill="hsl(232, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="R7.2
-x+" data-x="-0.8499999999999999" data-y="-6.6" cx="223.4006899950715" cy="219.67471660916704" r="3" fill="hsl(233, 100%, 50%, 0.8)" />
+x+" data-x="-0.8499999999999999" data-y="-6.6" cx="232.90824261275273" cy="214.47382063245198" r="3" fill="hsl(233, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.1
-x-" data-x="-1.5225" data-y="-8.1" cx="161.5311319204863" cy="357.6737309019221" r="3" fill="hsl(203, 100%, 50%, 0.8)" />
+x-" data-x="-1.5225" data-y="-8.1" cx="167.83134612061517" cy="359.6267496111974" r="3" fill="hsl(203, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.2
-x-" data-x="-1.5225" data-y="-8.3" cx="161.5311319204863" cy="376.0735994742896" r="3" fill="hsl(204, 100%, 50%, 0.8)" />
+x-" data-x="-1.5225" data-y="-8.3" cx="167.83134612061517" cy="378.9804734750303" r="3" fill="hsl(204, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.3
-x-" data-x="-1.5225" data-y="-8.5" cx="161.5311319204863" cy="394.4734680466569" r="3" fill="hsl(205, 100%, 50%, 0.8)" />
+x-" data-x="-1.5225" data-y="-8.5" cx="167.83134612061517" cy="398.33419733886296" r="3" fill="hsl(205, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.4
-x-" data-x="-1.5225" data-y="-8.700000000000001" cx="161.5311319204863" cy="412.87333661902426" r="3" fill="hsl(206, 100%, 50%, 0.8)" />
+x-" data-x="-1.5225" data-y="-8.700000000000001" cx="167.83134612061517" cy="417.68792120269575" r="3" fill="hsl(206, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.5
-x+" data-x="1.5225" data-y="-8.1" cx="441.66913093477905" cy="357.6737309019221" r="3" fill="hsl(207, 100%, 50%, 0.8)" />
+x+" data-x="1.5225" data-y="-8.1" cx="462.4917919474684" cy="359.6267496111974" r="3" fill="hsl(207, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.6
-x+" data-x="1.5225" data-y="-8.3" cx="441.66913093477905" cy="376.0735994742896" r="3" fill="hsl(208, 100%, 50%, 0.8)" />
+x+" data-x="1.5225" data-y="-8.3" cx="462.4917919474684" cy="378.9804734750303" r="3" fill="hsl(208, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.7
-x+" data-x="1.5225" data-y="-8.700000000000001" cx="441.66913093477905" cy="412.87333661902426" r="3" fill="hsl(209, 100%, 50%, 0.8)" />
+x+" data-x="1.5225" data-y="-8.700000000000001" cx="462.4917919474684" cy="417.68792120269575" r="3" fill="hsl(209, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U5.8
-x+" data-x="1.5225" data-y="-8.5" cx="441.66913093477905" cy="394.4734680466569" r="3" fill="hsl(210, 100%, 50%, 0.8)" />
+x+" data-x="1.5225" data-y="-8.5" cx="462.4917919474684" cy="398.33419733886296" r="3" fill="hsl(210, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y+" data-x="-2.15" data-y="-6.6" cx="103.80154427468375" cy="219.67471660916704" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y+" data-x="-2.15" data-y="-6.6" cx="107.10903749784" cy="214.47382063245198" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="-0.8499999999999999" data-y="-6.6" cx="223.4006899950715" cy="219.67471660916704" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x+" data-x="-0.8499999999999999" data-y="-6.6" cx="232.90824261275273" cy="214.47382063245198" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-1.5225" data-y="-8.700000000000001" cx="161.5311319204863" cy="412.87333661902426" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x-" data-x="-1.5225" data-y="-8.700000000000001" cx="167.83134612061517" cy="417.68792120269575" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-1.5225" data-y="-8.1" cx="161.5311319204863" cy="357.6737309019221" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x-" data-x="-1.5225" data-y="-8.1" cx="167.83134612061517" cy="359.6267496111974" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-1.5225" data-y="-8.3" cx="161.5311319204863" cy="376.0735994742896" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x-" data-x="-1.5225" data-y="-8.3" cx="167.83134612061517" cy="378.9804734750303" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-1.5225" data-y="-8.5" cx="161.5311319204863" cy="394.4734680466569" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x-" data-x="-1.5225" data-y="-8.5" cx="167.83134612061517" cy="398.33419733886296" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="1.8225" data-y="-8.1" cx="469.2689337933301" cy="357.6737309019221" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x+" data-x="1.5225" data-y="-8.1" cx="462.4917919474684" cy="359.6267496111974" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="1.9224999999999999" data-y="-8.3" cx="478.46886807951375" cy="376.0735994742896" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x+" data-x="1.5225" data-y="-8.3" cx="462.4917919474684" cy="378.9804734750303" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: y-" data-x="1.6235" data-y="-8.901" cx="450.9610645638246" cy="431.3652045342533" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: y-" data-x="1.6235" data-y="-8.901" cx="472.26542249870397" cy="437.1384136858476" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="-1.95,-6.6 1.5225,-8.5" data-type="line" data-label="" points="122.2014128470511,219.67471660916704 441.66913093477905,394.4734680466569" fill="none" stroke="hsl(154, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-1.95,-6.6 1.5225,-8.5" data-type="line" data-label="" points="126.46276136167273,214.47382063245198 462.4917919474684,398.33419733886296" fill="none" stroke="hsl(154, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-0.8499999999999999,-6.6 -1.5225,-8.700000000000001" data-type="line" data-label="" points="223.4006899950715,219.67471660916704 161.5311319204863,412.87333661902426" fill="none" stroke="hsl(172, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-0.8499999999999999,-6.6 -1.5225,-8.700000000000001" data-type="line" data-label="" points="232.90824261275273,214.47382063245198 167.83134612061517,417.68792120269575" fill="none" stroke="hsl(172, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.95,-6.6 -2.15,-6.6 -2.15,-7.55 1.7225000000000004,-7.55 1.7225000000000004,-8.5 1.5225000000000002,-8.5" data-type="line" data-label="" points="122.2014128470511,219.67471660916704 103.80154427468375,219.67471660916704 103.80154427468375,307.0740923279119 460.06899950714643,307.0740923279119 460.06899950714643,394.4734680466569 441.6691309347791,394.4734680466569" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.95,-6.6 -2.15,-6.6 -2.15,-7.55 2.9435000000000002,-7.55 2.9435000000000002,-8.5 1.5225000000000002,-8.5" data-type="line" data-label="" points="126.46276136167273,214.47382063245198 107.10903749784,214.47382063245198 107.10903749784,306.40400898565747 600,306.40400898565747 600,398.33419733886296 462.4917919474684,398.33419733886296" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.5225,-8.1 1.8225,-8.1" data-type="line" data-label="" points="441.66913093477905,357.6737309019221 469.2689337933301,357.6737309019221" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="1.5225,-8.700000000000001 1.6235,-8.700000000000001 1.6235,-8.901" data-type="line" data-label="" points="462.4917919474684,417.68792120269575 472.26542249870397,417.68792120269575 472.26542249870397,437.1384136858476" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="1.5225,-8.3 1.9224999999999999,-8.3" data-type="line" data-label="" points="441.66913093477905,376.0735994742896 478.46886807951375,376.0735994742896" fill="none" stroke="purple" stroke-width="1" />
+    <rect data-type="rect" data-label="schematic_component_0" data-x="-1.4" data-y="-6.6" x="126.46276136167273" y="176.78676412649043" width="106.44548125108" height="75.37411301192321" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
-    <polyline data-points="1.5225,-8.700000000000001 1.6235,-8.700000000000001 1.6235,-8.901" data-type="line" data-label="" points="441.66913093477905,412.87333661902426 450.9610645638246,412.87333661902426 450.9610645638246,431.3652045342533" fill="none" stroke="purple" stroke-width="1" />
-  </g>
-  <g>
-    <rect data-type="rect" data-label="schematic_component_0" data-x="-1.4" data-y="-6.6" x="122.2014128470511" y="183.84508033514044" width="101.1992771480204" height="71.6592725480532" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010869642857142855" />
-  </g>
-  <g>
-    <rect data-type="rect" data-label="schematic_component_1" data-x="0" data-y="-8.4" x="161.5311319204863" y="339.27386232955485" width="280.13799901429275" height="91.99934286183668" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010869642857142855" />
+    <rect data-type="rect" data-label="schematic_component_1" data-x="0" data-y="-8.4" x="167.83134612061517" y="340.27302574736484" width="294.6604458268532" height="96.76861931916358" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: V3V3
-globalConnNetId: connectivity_net0" data-x="-2.15" data-y="-6.3" x="94.60160998850009" y="164.47511089206512" width="18.399868572367353" height="55.19960571710192" fill="#ef444466" stroke="#ef4444" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net0" data-x="-2.15" data-y="-6.3" x="97.43217556592361" y="156.41264904095385" width="19.353723863832755" height="58.06117159149812" fill="#ef444466" stroke="#ef4444" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_CS
-globalConnNetId: connectivity_net1" data-x="-0.3689999999999999" data-y="-6.6" x="223.4926893379333" y="210.4747823229834" width="88.31936914736326" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net1" data-x="-0.3689999999999999" data-y="-6.6" x="233.0050112320719" y="204.7969587005357" width="92.8978745463971" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_CS
-globalConnNetId: connectivity_net1" data-x="-2.0035" data-y="-8.700000000000001" x="73.11976343026123" y="403.6734023328406" width="88.31936914736323" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net1" data-x="-2.0035" data-y="-8.700000000000001" x="74.83670295489893" y="408.01105927077947" width="92.8978745463971" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_SCK
-globalConnNetId: connectivity_net2" data-x="-2.0635" data-y="-8.1" x="62.0798422868408" y="348.4737966157385" width="99.35929029078366" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net2" data-x="-2.0635" data-y="-8.1" x="63.22446863659928" y="349.9498876792811" width="104.51010886469675" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_DATA0
-globalConnNetId: connectivity_net3" data-x="-2.1835" data-y="-8.3" x="40" y="366.873665188106" width="121.43913257762446" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net3" data-x="-2.1835" data-y="-8.3" x="40" y="369.3036115431139" width="127.73457750129603" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_DATA1
-globalConnNetId: connectivity_net4" data-x="-2.1835" data-y="-8.5" x="40" y="385.27353376047324" width="121.43913257762446" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net4" data-x="-2.1835" data-y="-8.5" x="40" y="388.6573354069466" width="127.73457750129603" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_DATA2
-globalConnNetId: connectivity_net5" data-x="2.4835000000000003" data-y="-8.1" x="469.36093313619193" y="348.4737966157385" width="121.43913257762443" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net5" data-x="2.1835" data-y="-8.1" x="462.5885605667876" y="349.9498876792811" width="127.73457750129603" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: QSPI_DATA3
-globalConnNetId: connectivity_net6" data-x="2.5835" data-y="-8.3" x="478.56086742237557" y="366.873665188106" width="121.43913257762443" height="18.399868572367268" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net6" data-x="2.1835" data-y="-8.3" x="462.5885605667876" y="369.3036115431139" width="127.73457750129603" height="19.35372386383267" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.010333928571428572" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: GND
-globalConnNetId: connectivity_net7" data-x="1.6235" data-y="-9.141" x="441.76113027764086" y="431.3652045342533" width="18.39986857236738" height="44.159684573681716" fill="#00000066" stroke="#000000" stroke-width="0.010869642857142855" />
+globalConnNetId: connectivity_net7" data-x="1.6235" data-y="-9.141" x="462.5885605667876" y="437.1384136858476" width="19.353723863832784" height="46.44893727319857" fill="#00000066" stroke="#000000" stroke-width="0.010333928571428572" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
@@ -164,12 +158,12 @@ globalConnNetId: connectivity_net7" data-x="1.6235" data-y="-9.141" x="441.76113
 
       // Calculate real coordinates using inverse transformation
       const matrix = {
-        "a": 91.99934286183671,
+        "a": 96.76861931916363,
         "c": 0,
-        "e": 301.6001314276327,
+        "e": 315.1615690340418,
         "b": 0,
-        "d": -91.99934286183671,
-        "f": -387.5209462789552
+        "d": -96.76861931916363,
+        "f": -424.19906687402795
       };
       // Manually invert and apply the affine transform
       // Since we only use translate and scale, we can directly compute: