Rounding error was the problem

closes #7

Author: dragoncoder047

schemascii/utils.py

@@ -27,6 +27,11 @@ def colinear(*points: complex) -> bool:
     return len(set(phase(p - points[0]) for p in points[1:])) == 1
 
 
+def force_int(p: complex) -> complex:
+    "Force the coordinates of the complex number to line on the integer grid."
+    return complex(round(p.real), round(p.imag))
+
+
 def sharpness_score(points: list[complex]) -> float:
     """Returns a number indicating how twisty the line is -- higher means
     the corners are sharper."""
@@ -95,7 +100,7 @@ def iterate_line(p1: complex, p2: complex, step: float = 1.0):
     vec = p2 - p1
     point = p1
     while abs(vec) > abs(point - p1):
-        yield point
+        yield force_int(point)
         point += rect(step, phase(vec))
     yield point
 

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, bunch_o_lines, XML, find_dots
+from .utils import force_int, iterate_line, bunch_o_lines, XML, find_dots
 
 # cSpell:ignore dydx
 
@@ -77,18 +77,16 @@ def blank_wire(grid: Grid, p1: complex, p2: complex):
     "Blank out the wire from p1 to p2."
     # Crazy math!!
     way = int(phase(p1 - p2) / pi % 1.0 * 2)
-    side = rect(1, phase(p1 - p2) + pi / 2)
+    side = force_int(rect(1, phase(p1 - p2) + pi / 2))
+    # way: 0: Horizontal, 1: Vertical
+    # Don't mask out wire crosses
+    cross = ["|()", "-"][way]
+    swap = "|-"[way]
     for px in iterate_line(p1, p2):
-        old = grid.get(px)
-        # way: 0: Horizontal, 1: Vertical
-        # Don't mask out wire crosses
-        keep = ["|()", "-"][way]
-        swap = "|-"[way]
-        if old not in keep:
-            if grid.get(px + side) in keep and grid.get(px - side) in keep:
-                grid.setmask(px, swap)
-            else:
-                grid.setmask(px)
+        if grid.get(px + side) in cross and grid.get(px - side) in cross:
+            grid.setmask(px, swap)
+        else:
+            grid.setmask(px)
 
 
 def next_wire(grid: Grid, **options) -> str | None:

schemascii_example.css

@@ -6,6 +6,7 @@ svg.schemascii .wire polyline {
     stroke: var(--sch-color, blue);
     stroke-width: 2;
     stroke-linecap: round;
+    stroke-linejoin: round;
     transition-duration: 0.2s;
     fill: transparent;
 }

test_data/test1.txt

@@ -1,10 +1,5 @@
-!padding=30!
-G3----------L1------G4
-
-G2------L2###########-------G1
-L1:220u
-L2:330u
-G1:earth
-G2:chassis
-G3:signal
-G4:common
+---------------------*
+                     |
+---------------------|------
+                     |
+---------------------*