add options and label formatting option

Author: dragoncoder047

schemascii/__main__.py

@@ -9,24 +9,51 @@ def cli_main():
         prog="schemascii",
         description="Render ASCII-art schematics into SVG.")
     ap.add_argument("-V", "--version",
-                    type="version",
-                    version=__version__)
+                    action="version",
+                    version="%(prog)s " + __version__)
     ap.add_argument("in_file",
                     help="File to process.")
     ap.add_argument("-o", "--out",
                     default=None,
                     dest="out_file",
                     help="Output SVG file. (default input file plus .svg)")
+    ap.add_argument("--padding",
+                    help="Amount of padding to add on the edges.",
+                    type=int,
+                    default=10)
+    ap.add_argument("--scale",
+                    help="Scale at which to enlarge the entire diagram by.",
+                    type=int,
+                    default=15)
+    ap.add_argument("--stroke_width",
+                    help="Width of the lines",
+                    type=int,
+                    default=2)
+    ap.add_argument("--stroke",
+                    help="Color of the lines.",
+                    default="black")
+    ap.add_argument("--label",
+                    help="Component label style "
+                    "(L=include label, V=include value, VL=both)",
+                    choices="L V VL".split(),
+                    default="VL")
     args = ap.parse_args()
     if args.out_file is None:
         args.out_file = args.in_file + ".svg"
+    text = None
+    if args.in_file == "-":
+        text = sys.stdin.read()
+        args.in_file = "<stdin>"
     try:
-        result_svg = render(args.in_file)
+        result_svg = render(args.in_file, text, **vars(args))
     except Error as err:
         print(repr(err), file=sys.stderr)
         sys.exit(1)
-    with open(args.out_file, "w", encoding="utf-8") as out:
-        out.write(result_svg)
+    if args.out_file == "-":
+        print(result_svg)
+    else:
+        with open(args.out_file, "w", encoding="utf-8") as out:
+            out.write(result_svg)
 
 
 if __name__ == '__main__':

schemascii/components_render.py

@@ -200,6 +200,7 @@ def integrated_circuit(
         bom_data: BOMData | None,
         **options):
     "Draw an IC"
+    label_style = options.get("label", "VL")
     scale = options.get("scale", 1)
     sz = (box.p2 - box.p1) * scale
     mid = (box.p2 + box.p1) * scale / 2
@@ -217,9 +218,10 @@ def integrated_circuit(
             term.pt + rect(1, SIDE_TO_ANGLE_MAP[term.side])
         )], **options)
     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"),
+        (XML.tspan(f"{box.type}{box.id}", class_="cmp-id")
+         * bool("L" in label_style)),
+        " " * (bool(bom_data.data) and "L" in label_style),
+        XML.tspan(bom_data.data, class_="part-num") * bool("V" in label_style),
         x=mid.real,
         y=mid.imag,
         text__anchor="middle",

schemascii/utils.py

@@ -148,6 +148,7 @@ def id_text(
         point: complex | None = None,
         **options):
     "Format the component ID and value around the point"
+    label_style = options.get("label", "VL")
     if point is None:
         point = sum(t.pt for t in terminals) / len(terminals)
     data = ""
@@ -165,9 +166,10 @@ def id_text(
             classy = "cmp-value"
         data = XML.tspan(text, class_=classy)
     return XML.text(
-        XML.tspan(f"{box.type}{box.id}", class_="cmp-id"),
-        " " * bool(data),
-        data,
+        (XML.tspan(f"{box.type}{box.id}", class_="cmp-id")
+         * bool("L" in label_style)),
+        " " * (bool(data) and "L" in label_style),
+        data * bool("V" in label_style),
         x=point.real,
         y=point.imag,
         text__anchor="start" if (

test_data/test_resistors.txt

@@ -12,7 +12,7 @@
 |                    |           |
 |     *--------------*-----C3+---*
 |     2              |
-|   .~~~.      *----CV1 CV1:5p
+|   .~~~.      *-CV1-* CV1:5p
 *--1:U1 :3-----*
     .~~~.
 U1:7805