Add dots on wires (fixes #5)

Author: dragoncoder047

schemascii/utils.py

@@ -121,7 +121,23 @@ def polylinegon(points: list[complex], is_polygon: bool = False, **options):
         for x in points)
     if is_polygon:
         return XML.polygon(points=pts, fill=c)
-    return XML.polyline(points=pts, fill="transparent", stroke__width=w, stroke=c)
+    return XML.polyline(
+        points=pts, fill="transparent", stroke__width=w, stroke=c)
+
+
+def find_dots(points: list[tuple[complex, complex]]) -> list[complex]:
+    "Finds all the points where there are 3 or more connecting wires."
+    seen = {}
+    for p1, p2 in points:
+        if p1 not in seen:
+            seen[p1] = 1
+        else:
+            seen[p1] += 1
+        if p2 not in seen:
+            seen[p2] = 1
+        else:
+            seen[p2] += 1
+    return [pt for pt, count in seen.items() if count > 2]
 
 
 def bunch_o_lines(points: list[tuple[complex, complex]], **options):
@@ -131,11 +147,11 @@ def bunch_o_lines(points: list[tuple[complex, complex]], **options):
     w = options["stroke_width"]
     c = options["stroke"]
     for p1, p2 in points:
-        out += XML.line(
-            x1=p1.real * scale,
-            y1=p1.imag * scale,
-            x2=p2.real * scale,
-            y2=p2.imag * scale,
+        out += XML.polyline(
+            points=f"{p1.real * scale},"
+            f"{p1.imag * scale} "
+            f"{p2.real * scale},"
+            f"{p2.imag * scale}",
             stroke=c,
             stroke__width=w)
     return out

schemascii/wires.py

@@ -1,7 +1,7 @@
 from cmath import phase, rect
 from math import pi
 from .grid import Grid
-from .utils import iterate_line, merge_colinear, XML
+from .utils import iterate_line, merge_colinear, XML, find_dots
 
 # cSpell:ignore dydx
 
@@ -115,6 +115,7 @@ def next_wire(grid: Grid, **options) -> str | None:
         blank_wire(grid, p1, p2)
         if p1 == p2:
             raise RuntimeError("0-length wire")
+    dots = find_dots(line_pieces)
     return XML.g(
         *(
             XML.line(
@@ -123,10 +124,16 @@ def next_wire(grid: Grid, **options) -> str | None:
                 x2=p2.real * scale,
                 y2=p2.imag * scale,
                 stroke__width=stroke_width,
-                stroke=color,
-            )
-            for p1, p2 in line_pieces
-        ),
+                stroke=color)
+            for p1, p2 in line_pieces),
+        *(
+            XML.circle(
+                cx=pt.real * scale,
+                cy=pt.imag * scale,
+                r=2 * stroke_width,
+                stroke="none",
+                fill=color)
+            for pt in dots),
         class_="wire")
 
 

schemascii_example.css

@@ -11,6 +11,11 @@ svg.schemascii .wire line {
     transition-duration: 0.2s;
 }
 
+svg.schemascii .wire circle {
+    fill: var(--sch-color, blue);
+    transition-duration: 0.2s;
+}
+
 svg.schemascii :is(.wire, .component):hover {
     --sch-color: lime;
 }