fix: trace on hover shows correct connection

tscircuit · Nov 26, 2024 · 69e577f · 69e577f
1 parent ca36559
commit 69e577f
Show file tree

Hide file tree

Showing 6 changed files with 630 additions and 5 deletions.
diff --git a/...n-json-to-circuit-json/dsn-component-converters/convert-nets-to-source-nets-and-traces.ts b/...n-json-to-circuit-json/dsn-component-converters/convert-nets-to-source-nets-and-traces.ts
@@ -8,6 +8,7 @@ export const convertNetsToSourceNetsAndTraces = ({
   const result: Array<SourceNet | SourceTrace> = []
   const { nets } = dsnPcb.network
 
+  let source_trace_id = 0
   for (const { name, pins } of nets) {
     if (name.startsWith("unconnected-")) continue
     const source_net: SourceNet = {
@@ -28,9 +29,10 @@ export const convertNetsToSourceNetsAndTraces = ({
       type: "source_trace",
       connected_source_net_ids: [source_net.source_net_id],
       connected_source_port_ids,
-      source_trace_id: `source_trace_${name}`,
+      source_trace_id: `source_trace_${source_trace_id}`,
     }
     result.push(source_net, source_trace)
+    source_trace_id++
   }
 
   return result

diff --git a/...dsn-pcb/dsn-json-to-circuit-json/dsn-component-converters/convert-padstacks-to-smtpads.ts b/...dsn-pcb/dsn-json-to-circuit-json/dsn-component-converters/convert-padstacks-to-smtpads.ts
@@ -84,9 +84,9 @@ export function convertPadstacksToSmtPads(
 
         const pcbPad: AnyCircuitElement = {
           type: "pcb_smtpad",
-          pcb_smtpad_id: `${pin.padstack_name}_${pin.pin_number}`,
+          pcb_smtpad_id: `pcb_smtpad_${pin.pin_number - 1}`,
           pcb_component_id: componentId,
-          pcb_port_id: `${pin.padstack_name}_${pin.pin_number}`,
+          pcb_port_id: `pcb_port_${componentId}-Pad${pin.pin_number}`,
           shape: "rect",
           x: circuitX,
           y: circuitY,

diff --git a/.../dsn-json-to-circuit-json/dsn-component-converters/convert-polyline-path-to-pcb-traces.ts b/.../dsn-json-to-circuit-json/dsn-component-converters/convert-polyline-path-to-pcb-traces.ts
@@ -28,7 +28,7 @@ export const convertPolylinePathToPcbTraces = ({
 
   traces.push({
     type: "pcb_trace",
-    pcb_trace_id: `trace_${netName}_${Math.random().toString(36).substr(2, 9)}`,
+    pcb_trace_id: `pcb_trace_${netName}`,
     source_trace_id: netName,
     route_thickness_mode: "constant",
     should_round_corners: false,

diff --git a/...cb/dsn-json-to-circuit-json/dsn-component-converters/convert-wiring-path-to-pcb-traces.ts b/...cb/dsn-json-to-circuit-json/dsn-component-converters/convert-wiring-path-to-pcb-traces.ts
@@ -41,7 +41,7 @@ export const convertWiringPathToPcbTraces = ({
 
     const pcbTrace: PcbTrace = {
       type: "pcb_trace",
-      pcb_trace_id: `trace_${netName}_${Math.random().toString(36).substr(2, 9)}`,
+      pcb_trace_id: `pcb_trace_${netName}`,
       source_trace_id: netName,
       route_thickness_mode: "constant",
       should_round_corners: false,