warehack.ing/spicebook
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent label offsets across all schematic layout engines

Browse Source 
Add ofst=0.15 to all component labels for uniform clearance between
label text and component bodies. Previously, loop layout had no offsets,
grid layout was missing offsets on multi-terminal devices (BJT/FET), and
connected layout was missing offsets on transistor and horizontal labels.
This commit is contained in:
Ryan Malloy 2026-02-23 14:25:50 -07:00
parent 6f239c185e
commit b89e520479
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/spicebook/engine/schematic.py
View File

@ -638,7 +638,7 @@ def _render_loop(parsed: ParsedNetlist, loop: list[SpiceComponent]) -> str:
d.add( d.add(
_get_element(source, parsed.models) _get_element(source, parsed.models)
.up() .up()
.label(_component_label(source), loc="left") .label(_component_label(source), loc="left", ofst=0.15)
) )
d.add(elm.Ground()) d.add(elm.Ground())
return d.get_imagedata("svg").decode() return d.get_imagedata("svg").decode()
@ -647,7 +647,7 @@ def _render_loop(parsed: ParsedNetlist, loop: list[SpiceComponent]) -> str:
src = d.add( src = d.add(
_get_element(source, parsed.models) _get_element(source, parsed.models)
.up() .up()
.label(_component_label(source), loc="left") .label(_component_label(source), loc="left", ofst=0.15)
) )
# All components except the last go right across the top # All components except the last go right across the top
@ -655,7 +655,7 @@ def _render_loop(parsed: ParsedNetlist, loop: list[SpiceComponent]) -> str:
d.add( d.add(
_get_element(comp, parsed.models) _get_element(comp, parsed.models)
.right() .right()
.label(_component_label(comp)) .label(_component_label(comp), ofst=0.15)
) )
# Last component goes down, ending at the same y-level as the source start # Last component goes down, ending at the same y-level as the source start
@ -664,7 +664,7 @@ def _render_loop(parsed: ParsedNetlist, loop: list[SpiceComponent]) -> str:
_get_element(last_comp, parsed.models) _get_element(last_comp, parsed.models)
.down() .down()
.toy(src.start) .toy(src.start)
.label(_component_label(last_comp), loc="right") .label(_component_label(last_comp), loc="right", ofst=0.15)
) )
# Return wire along the bottom back to source start # Return wire along the bottom back to source start
@ -1009,7 +1009,7 @@ def _render_grid(parsed: ParsedNetlist) -> str:
node_ys = [tiers.get(n, _GRID_MID_Y) for n in comp.nodes[:3]] node_ys = [tiers.get(n, _GRID_MID_Y) for n in comp.nodes[:3]]
center_y = (max(node_ys) + min(node_ys)) / 2 center_y = (max(node_ys) + min(node_ys)) / 2
placed_elem = d.add( placed_elem = d.add(
elem.at((x, center_y)).label(_component_label(comp)) elem.at((x, center_y)).label(_component_label(comp), loc="right", ofst=0.15)
) )
elif len(comp.nodes) >= 2: elif len(comp.nodes) >= 2:
# 2-terminal: orient vertically between the two node tiers # 2-terminal: orient vertically between the two node tiers
@ -1199,7 +1199,7 @@ def _draw_horiz_then_down(d, parsed, start, path, going_right):
) )
break break
else: else:
d.add(getattr(elem, h_dir)().label(_component_label(comp))) d.add(getattr(elem, h_dir)().label(_component_label(comp), ofst=0.15))
# Single-component horizontal path ending at ground/supply/open # Single-component horizontal path ending at ground/supply/open
if len(comps) == 1: if len(comps) == 1:
@ -1228,7 +1228,7 @@ def _render_connected(parsed: ParsedNetlist, layout: ActiveLayout) -> str:
# (Mims convention: transistor type label beside the symbol) # (Mims convention: transistor type label beside the symbol)
if layout.device_type.startswith("bjt"): if layout.device_type.startswith("bjt"):
dev_elem = elm.BjtPnp() if is_inverted else elm.BjtNpn() dev_elem = elm.BjtPnp() if is_inverted else elm.BjtNpn()
q = d.add(dev_elem.label(_component_label(layout.device), loc="right")) q = d.add(dev_elem.label(_component_label(layout.device), loc="right", ofst=0.15))
anchors = { anchors = {
"collector": q.collector, "collector": q.collector,
"base": q.base, "base": q.base,
@ -1238,7 +1238,7 @@ def _render_connected(parsed: ParsedNetlist, layout: ActiveLayout) -> str:
input_term = "base" input_term = "base"
else: else:
dev_elem = elm.PFet() if is_inverted else elm.NFet() dev_elem = elm.PFet() if is_inverted else elm.NFet()
q = d.add(dev_elem.label(_component_label(layout.device), loc="right")) q = d.add(dev_elem.label(_component_label(layout.device), loc="right", ofst=0.15))
anchors = { anchors = {
"drain": q.drain, "drain": q.drain,
"gate": q.gate, "gate": q.gate,