implement batteries and IC's

good god I touched almost every file!!

Author: dragoncoder047

.vscode/settings.json

@@ -3,6 +3,7 @@
         "Cbox",
         "polylinegon",
         "rendec",
-        "schemascii"
+        "schemascii",
+        "tspan"
     ]
 }

designators.md

@@ -5,7 +5,7 @@
 | A, ASSY | Separable assembly or sub-assembly ||
 | AE | Aerial, antenna ||
 | AT | Attenuator or isolator ||
-| B, BT | Battery ||
+| B, BT, BAT | Battery | Yes |
 | BR | Bridge rectifier ||
 | C | Capacitor | Yes |
 | CN | Connector ||

format.md

@@ -11,17 +11,17 @@ Crossed:         Joined:       Corner:      Corner:      Crossed:      Crossed:
     |               |                                        |             |
 ```
 
-Small components are notated with their reference designator: one or more uppercase letters followed by an ID number. They are always written horizontally even if the terminals are on the top and bottom. IDs are allowed to be duplicated and result in the same component values. Components can be padded on either side with `#`'s to make them bigger.
+Small components are notated with their reference designator: one or more uppercase letters followed by an ID, which can either be a number, or a period followed by some text. They are always written horizontally even if the terminals are on the top and bottom. IDs are allowed to be duplicated and result in the same component values. Components can be padded on either side with `#`'s to make them bigger.
 
 Examples:
 
 * `C33`
 * `Q1001`
-* `L51`
+* `L.Coil`
 * `F3#`
 * `D7#####`
 * `U1#####`
-* `####R2####`
+* `####R.Heater####`
 
 Components are able to accept "flags", which are other punctuation characters and lowercase letters touching them.
 

schemascii/components.py

@@ -2,7 +2,7 @@
 from grid import Grid
 from utils import Cbox, BOMData
 
-SMALL_COMPONENT_OR_BOM = re.compile(r'#*([A-Z]+)(\d+)(:[^\s]+)?#*')
+SMALL_COMPONENT_OR_BOM = re.compile(r'#*([A-Z]+)(\d+|\.\w+)(:[^\s]+)?#*')
 
 
 def find_small(grid: Grid) -> tuple[list[Cbox], list[BOMData]]:
@@ -14,11 +14,11 @@ def find_small(grid: Grid) -> tuple[list[Cbox], list[BOMData]]:
         for m in SMALL_COMPONENT_OR_BOM.finditer(line):
             if m.group(3):
                 boms.append(BOMData(m.group(1),
-                                    int(m.group(2)), m.group(3)[1:]))
+                                    m.group(2), m.group(3)[1:]))
             else:
                 components.append(Cbox(complex(m.start(), i), complex(m.end(),
                                                                       i),
-                                       m.group(1), int(m.group(2))))
+                                       m.group(1), m.group(2)))
             for z in range(*m.span(0)):
                 grid.setmask(complex(z, i))
     return components, boms
@@ -36,8 +36,7 @@ def find_big(grid: Grid) -> tuple[list[Cbox], list[BOMData]]:
         for i, line in enumerate(grid.lines):
             if m1 := TOP_OF_BOX.search(line):
                 tb = m1.group()
-                x1 = m1.start()
-                x2 = m1.end()
+                x1, x2 = m1.span()
                 y1 = i
                 y2 = None
                 for j, l in enumerate(grid.lines):
@@ -73,7 +72,7 @@ def find_big(grid: Grid) -> tuple[list[Cbox], list[BOMData]]:
                     merd = results[0]
                 boxes.append(
                     Cbox(complex(x1, y1),
-                         complex(x2, y2),
+                         complex(x2 - 1, y2),
                          merd.type,
                          merd.id))
                 boms.extend(resb)
@@ -93,3 +92,12 @@ def find_all(grid: Grid) -> tuple[list[Cbox], list[BOMData]]:
     b1, l1 = find_big(grid)
     b2, l2 = find_small(grid)
     return b1+b2, l1+l2
+
+
+if __name__ == '__main__':
+    grid = Grid("../test_data/test_resistors.txt")
+    bbb, _ = find_all(grid)
+    all_pts = []
+    for box in bbb:
+        all_pts.extend([box.p1, box.p2])
+    grid.spark(*all_pts)

schemascii/components_render.py

@@ -131,6 +131,33 @@ def capacitor(
         + make_plus(terminals, mid, angle, **kwargs))
 
 
+@component("B", "BT", "BAT")
+@polarized
+@no_ambiguous
+def battery(
+        box: Cbox,
+        terminals: list[Terminal],
+        bom_data: BOMData | None,
+        **kwargs):
+    "Draw a battery cell"
+    t1, t2 = terminals[0].pt, terminals[1].pt
+    mid = (t1 + t2) / 2
+    angle = phase(t1 - t2)
+    lines = [
+        (t1, mid + rect(.5, angle)),
+        (t2, mid + rect(-.5, angle))] + deep_transform([
+            (complex(.5,  .5), complex(-.5,  .5)),
+            (complex(.25, .16), complex(-.25, .16)),
+            (complex(.5, -.16), complex(-.5,  -.16)),
+            (complex(.25, -.5), complex(-.25, -.5)),
+        ], mid, angle)
+    text_pt = make_text_point(t1, t2, **kwargs)
+    return (id_text(
+        box, bom_data, terminals, (("V", False), ("Ah", False)),
+        text_pt, **kwargs)
+        + bunch_o_lines(lines, **kwargs))
+
+
 @component("D", "LED", "CR")
 @polarized
 @no_ambiguous
@@ -153,6 +180,42 @@ def diode(
             + bunch_o_lines(lines, **kwargs)
             + polylinegon(triangle, True, **kwargs))
 
+
+@component("U", "IC")
+@no_ambiguous
+def integrated_circuit(
+        box: Cbox,
+        terminals: list[Terminal],
+        bom_data: BOMData | None,
+        **kwargs):
+    "Draw an IC"
+    scale = kwargs.get("scale", 1)
+    sz = (box.p2 - box.p1 + 2) * scale
+    mid = (box.p2 + box.p1) * scale / 2
+    out = XML.rect(
+        x=box.p1.real * scale - scale,
+        y=box.p1.imag * scale,
+        width=sz.real,
+        height=sz.imag,
+        stroke__width=kwargs.get("stroke_width", 1),
+        stroke=kwargs.get("stroke", "black"))
+    for term in terminals:
+        out += bunch_o_lines([(
+            term.pt,
+            term.pt + rect(1, term.side * pi / 2)
+        )], **kwargs)
+    out += XML.text(
+        XML.tspan(f"{box.type}{box.id}", class_="cmp-id"),
+        " " * bool(bom_data.data),
+        XML.tspan(bom_data.data, class_="part-num"),
+        x=mid.real,
+        y=mid.imag,
+        text__anchor="middle",
+        font__size=kwargs.get("scale", 1),
+        fill=kwargs.get("stroke", "black"))
+    print("IC's in progress...")
+    return out
+
 # code for drawing
 # https://github.com/pfalstad/circuitjs1/tree/master/src/com/lushprojects/circuitjs1/client
 # https://github.com/KenKundert/svg_schematic/blob/0abb5dc/svg_schematic.py

schemascii/edgemarks.py

@@ -10,10 +10,10 @@ def inner_over_edges(func: FunctionType):
         out = []
         for p, s in chain(
             # Top side
-            ((complex(xx, int(box.p2.imag) - 1), Side.TOP)
+            ((complex(xx, int(box.p1.imag) - 1), Side.TOP)
                 for xx in range(int(box.p1.real), int(box.p2.real) + 1)),
             # Right side
-            ((complex(int(box.p2.real) + 0, yy), Side.RIGHT)
+            ((complex(int(box.p2.real) + 1, yy), Side.RIGHT)
                 for yy in range(int(box.p1.imag), int(box.p2.imag) + 1)),
             # Bottom side
             ((complex(xx, int(box.p2.imag) + 1), Side.BOTTOM)

schemascii/utils.py

@@ -16,10 +16,10 @@
 
 class Side(IntEnum):
     "Which edge the flag was found on."
-    TOP = 0
-    RIGHT = 1
-    BOTTOM = 2
-    LEFT = 3
+    RIGHT = 0
+    TOP = 1
+    LEFT = 2
+    BOTTOM = 3
 
 
 def colinear(points: list[complex]) -> bool:
@@ -80,12 +80,6 @@ def iterate_line(p1: complex, p2: complex, step: float = 1.) -> GeneratorType:
     yield point
 
 
-def extend(p1: complex, p2: complex) -> complex:
-    """Extends the line from p1 to p2 by 1 in the direction of p2,
-    returns the modified p2."""
-    return p2 + rect(1, phase(p2 - p1))
-
-
 def deep_transform(data, origin: complex, theta: float):
     """Transform the point first by translating by origin,
     then rotating by theta."""
@@ -206,5 +200,5 @@ def make_plus(
     return XML.g(
         bunch_o_lines(deep_transform(deep_transform(
             [(.125, -.125), (.125j, -.125j)], 0, theta),
-            center + deep_transform(.33+.66j, 0, theta), 0), **kwargs),
+            center + deep_transform(.33+.75j, 0, theta), 0), **kwargs),
         class_="plus")

schemascii/wires.py

@@ -2,7 +2,7 @@
 from math import pi
 from cmath import rect
 from grid import Grid
-from utils import iterate_line, extend, merge_colinear, XML
+from utils import iterate_line, merge_colinear, XML
 
 # cSpell:ignore dydx
 
@@ -137,7 +137,6 @@ def get_wires(grid: Grid, **options) -> str:
 
 
 if __name__ == '__main__':
-    with open('../test_data/test_resistors.txt') as f:
-        xg = Grid('foo.txt', f.read())
-        print(get_wires(xg, scale=20))
-        print(xg)
+    xg = Grid('../test_data/test_resistors.txt')
+    print(get_wires(xg, scale=20))
+    print(xg)

schemascii_example.css

@@ -15,7 +15,7 @@ svg.schemascii :is(.wire, .component):hover {
     --sch-color: lime;
 }
 
-svg.schemascii .component :is(polyline, path, line, polygon) {
+svg.schemascii .component :is(polyline, path, line, polygon, rect) {
     stroke: var(--sch-color, red);
     stroke-width: calc(0.15 * var(--sch-scale, 1));
     stroke-linecap: round;

test_data/test_resistors.txt

@@ -1,14 +1,20 @@
-*--------------------------------*
-|                                |
-*---+D1--+LED1--*   D1:2N7001    |
-                |   LED1:red     |
-       *--------*                |
+*-------------------------------#B.Foo
+|                                +
+*---+D1--+LED1--*   D1:2N7001    +
+                |   LED1:red     B1
+       *--------*                |B1:5V,100m
        |                         |
-      R4   R4:.3k    *-----------*
+      R4   R4:.3k    *-----------*       C3:2200u,2.5
        |             |
-       *----R2#####--|---* R2:0.01K,0.5K
+       *---R.Heater--|---* R.Heater:0.0081K,0.5K
        |             |   | R3:2000
        *----R3-------|---*-------*
                      |           |
-                     *-----C3+---*
-       C3:2200u,2.5
+      *--------------*-----C3+---*
+      a
+    .~~~.
+---d:U1 :b---
+    .~~~.
+      c
+      |
+U1:RAND04