add support for variable components

Author: dragoncoder047

designators.md

@@ -1,4 +1,4 @@
-(copied from <https://en.wikipedia.org/wiki/Reference_designator>)
+(copied from <https://en.wikipedia.org/wiki/Reference_designator> and edited lightly)
 
 | Designator | Component type | Implemented? |
 |:--:|:--|:--:|
@@ -8,6 +8,7 @@
 | B, BT, BAT | Battery | Yes |
 | BR | Bridge rectifier ||
 | C | Capacitor | Yes |
+| CV, VC | Variable capacitor | Yes |
 | CN | Connector ||
 | CRT | Cathode ray tube ||
 | D, LED, CR | Diode (all types, including LED), thyristor | Yes |
@@ -40,7 +41,6 @@
 | MCB | Miniature circuit breaker ||
 | MIC, MK | Microphone ||
 | MOSFET | Metal-oxide-semiconductor field-effect transistor ||
-| MOV | Metal-oxide varistor ||
 | MP | Mechanical part (including screws and fasteners) ||
 | NE | Neon lamp ||
 | OP | Opto-isolator ||
@@ -51,9 +51,9 @@
 | PU | Pickup ||
 | Q | Transistor (all types) ||
 | R | Resistor | Yes |
+| RV, VR | Variable resistor (potentiometer or rheostat) | Yes |
 | RN | Resistor network ||
 | RT | Thermistor ||
-| RV | Varistor, Variable resistor ||
 | S, SW | Switch (all types, including buttons) ||
 | SCR | Silicon-controlled rectifier ||
 | SUS | Silicon unilateral switch ||
@@ -64,10 +64,8 @@
 | TP | Test point ||
 | TUN | Tuner ||
 | V | Vacuum tube ||
-| VC | Variable capacitor ||
-| VDR | Voltage-dependent resistor ||
+| VDR, MOV | Voltage-dependent resistor (varistor) ||
 | VFD | Vacuum fluorescent display ||
-| VR | Voltage regulator (voltage reference), Variable resistor (potentiometer or rheostat) ||
 | VT | Voltage transformer ||
-| W | Wire ||
+| W | Wire | (implicit) |
 | X, XTAL, Y | Crystal oscillator, ceramic resonator ||

schemascii/components_render.py

@@ -3,7 +3,7 @@
 from math import pi
 from utils import (Cbox, Terminal, BOMData, XML, Side,
                    polylinegon, id_text, make_text_point,
-                   bunch_o_lines, deep_transform, make_plus)
+                   bunch_o_lines, deep_transform, make_plus, make_variable)
 from metric import format_metric_unit
 
 RENDERERS = {}
@@ -79,7 +79,7 @@ def sort_terminals(
     return sort_terminals
 
 
-@component("R")
+@component("R", "RV", "VR")
 @n_terminal(2)
 @no_ambiguous
 def resistor(
@@ -90,6 +90,7 @@ def resistor(
     "Draw a resistor"
     t1, t2 = terminals[0].pt, terminals[1].pt
     vec = t1 - t2
+    mid = (t1 + t2) / 2
     length = abs(vec)
     angle = phase(vec)
     quad_angle = angle + pi / 2
@@ -99,13 +100,14 @@ def resistor(
                       pow(-1, i) * rect(1, quad_angle) / 4)
     points.append(t2)
     text_pt = make_text_point(t1, t2, **kwargs)
-    return (id_text(
+    return (polylinegon(points, **kwargs)
+            + make_variable(mid, angle, "V" in box.type, **kwargs)
+            + id_text(
         box, bom_data, terminals, (("Ω", False), ("W", False)),
-        text_pt, **kwargs)
-        + polylinegon(points, **kwargs))
+        text_pt, **kwargs))
 
 
-@component("C")
+@component("C", "CV", "VC")
 @polarized
 @no_ambiguous
 def capacitor(
@@ -124,11 +126,12 @@ def capacitor(
             (complex(.4, -.25), complex(-.4, -.25)),
         ], mid, angle)
     text_pt = make_text_point(t1, t2, **kwargs)
-    return (id_text(
+    return (bunch_o_lines(lines, **kwargs)
+            + make_plus(terminals, mid, angle, **kwargs)
+            + make_variable(mid, angle, "V" in box.type, **kwargs)
+            + id_text(
         box, bom_data, terminals, (("F", True), ("V", False)),
-        text_pt, **kwargs)
-        + bunch_o_lines(lines, **kwargs)
-        + make_plus(terminals, mid, angle, **kwargs))
+        text_pt, **kwargs))
 
 
 @component("B", "BT", "BAT")
@@ -185,7 +188,7 @@ def diode(
     Side.RIGHT: pi,
     Side.TOP:  pi / 2,
     Side.LEFT: 0,
-    Side.RIGHT: 3 * pi / 2,
+    Side.BOTTOM: 3 * pi / 2,
 }
 
 

schemascii/utils.py

@@ -200,3 +200,19 @@ def make_plus(
             [(.125, -.125), (.125j, -.125j)], 0, theta),
             center + deep_transform(.33+.75j, 0, theta), 0), **kwargs),
         class_="plus")
+
+
+def make_variable(
+        center: complex,
+        theta: float,
+        is_variable: bool = True,
+        **options) -> str:
+    "Draw a 'variable' arrow across the component."
+    if not is_variable:
+        return ""
+    theta = theta % pi
+    return bunch_o_lines(deep_transform([
+        (-.75+.5j, .75-.5j),
+        (.75-.5j, .5-.55j),
+        (.75-.5j, .7-.25j),
+    ], center, theta), **options)

test_data/test_resistors.txt

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