Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option to add colors to connector pins #141

Merged
merged 4 commits into from
Nov 14, 2020
Merged

Add option to add colors to connector pins #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
711704d
Add option to define connector pin colors (#141)
formatc1702 Oct 23, 2020
4eea767
Implement changes suggested by @kvid
formatc1702 Nov 10, 2020
03a207d
Add more suggestions by @kvid
formatc1702 Nov 11, 2020
0d62b01
Add suggestion by @kvid
formatc1702 Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/wireviz/DataClasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class Connector:
notes: Optional[MultilineHypertext] = None
pinlabels: List[Pin] = field(default_factory=list)
pins: List[Pin] = field(default_factory=list)
pincolors: List[Color] = field(default_factory=list)
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved
color: Optional[Color] = None
show_name: Optional[bool] = None
show_pincount: Optional[bool] = None
Expand Down Expand Up @@ -140,6 +141,9 @@ def __post_init__(self) -> None:
if len(self.pins) != len(set(self.pins)):
raise Exception('Pins are not unique')

if self.pincolors:
self.pincolors.extend([None] * (len(self.pins) - len(self.pincolors))) # autofill missing pincolors as 'no color'
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved

if self.show_name is None:
self.show_name = not self.autogenerate # hide auto-generated designators by default

Expand Down
12 changes: 11 additions & 1 deletion src/wireviz/Harness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,24 @@ def create_graph(self) -> Graph:
pinhtml = []
pinhtml.append('<table border="0" cellspacing="0" cellpadding="3" cellborder="1">')

for pin, pinlabel in zip(connector.pins, connector.pinlabels):
for pin, pinlabel, pincolor in zip(connector.pins,
connector.pinlabels,
connector.pincolors if connector.pincolors else [None] * len(connector.pins)):
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved
if connector.hide_disconnected_pins and not connector.visible_pins.get(pin, False):
continue
pinhtml.append(' <tr>')
if connector.ports_left:
pinhtml.append(f' <td port="p{pin}l">{pin}</td>')
if pinlabel:
pinhtml.append(f' <td>{pinlabel}</td>')
if connector.pincolors:
if pincolor in wv_colors._color_hex.keys():
pinhtml.append(f'<td sides="tbl">{pincolor}</td>')
pinhtml.append(f'<td sides="tbr"><table border="0" cellborder="1"><tr><td bgcolor="{wv_colors.translate_color(pincolor, "HEX")}" width="8" height="8" fixedsize="true"></td></tr></table></td>')
else:
pinhtml.append(f'<td sides="tbl"></td>')
pinhtml.append(f'<td sides="tbr"></td>')
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved

if connector.ports_right:
pinhtml.append(f' <td port="p{pin}r">{pin}</td>')
pinhtml.append(' </tr>')
Expand Down