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

Use unique index for connector pin ports #229

Merged
merged 6 commits into from
Aug 23, 2021
Merged

Use unique index for connector pin ports #229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1127bcb
Use unique index for connector pin ports
formatc1702 Mar 23, 2021
7e2339e
Make internal pin IDs start from 1 instead of 0
formatc1702 Aug 22, 2021
4fef57b
Rename `pinid` to `pinindex`
formatc1702 Aug 22, 2021
b06ae96
Update type hints
formatc1702 Aug 22, 2021
afd4147
Update changelog
formatc1702 Aug 22, 2021
ef289f5
Revert "Update changelog"
formatc1702 Aug 23, 2021
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
2 changes: 1 addition & 1 deletion src/wireviz/DataClasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ class Connector:
pincount: Optional[int] = None
image: Optional[Image] = None
notes: Optional[MultilineHypertext] = None
pinlabels: List[Pin] = field(default_factory=list)
pins: List[Pin] = field(default_factory=list)
pinlabels: List[Pin] = field(default_factory=list)
kvid marked this conversation as resolved.
Show resolved Hide resolved
pincolors: List[Color] = field(default_factory=list)
color: Optional[Color] = None
show_name: Optional[bool] = None
Expand Down
21 changes: 12 additions & 9 deletions src/wireviz/Harness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ def connect(self, from_name: str, from_pin: (int, str), via_name: str, via_wire:
raise Exception(f'{via_name}:{via_wire} is used for more than one wire.')
via_wire = cable.wirelabels.index(via_wire) + 1 # list index starts at 0, wire IDs start at 1

self.cables[via_name].connect(from_name, from_pin, via_wire, to_name, to_pin)
from_pin_id = self.connectors[from_name].pins.index(from_pin) if from_pin is not None else None
to_pin_id = self.connectors[to_name].pins.index(to_pin) if to_pin is not None else None

self.cables[via_name].connect(from_name, from_pin_id, via_wire, to_name, to_pin_id)
if from_name in self.connectors:
self.connectors[from_name].activate_pin(from_pin)
if to_name in self.connectors:
Expand Down Expand Up @@ -135,12 +138,12 @@ def create_graph(self) -> Graph:
pinhtml = []
pinhtml.append('<table border="0" cellspacing="0" cellpadding="3" cellborder="1">')

for pin, pinlabel, pincolor in zip_longest(connector.pins, connector.pinlabels, connector.pincolors):
if connector.hide_disconnected_pins and not connector.visible_pins.get(pin, False):
for pinid, (pinname, pinlabel, pincolor) in enumerate(zip_longest(connector.pins, connector.pinlabels, connector.pincolors)):
if connector.hide_disconnected_pins and not connector.visible_pins.get(pinname, False):
continue
pinhtml.append(' <tr>')
if connector.ports_left:
pinhtml.append(f' <td port="p{pin}l">{pin}</td>')
pinhtml.append(f' <td port="p{pinid}l">{pinname}</td>')
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved
if pinlabel:
pinhtml.append(f' <td>{pinlabel}</td>')
if connector.pincolors:
Expand All @@ -155,7 +158,7 @@ def create_graph(self) -> Graph:
pinhtml.append( ' <td colspan="2"></td>')

if connector.ports_right:
pinhtml.append(f' <td port="p{pin}r">{pin}</td>')
pinhtml.append(f' <td port="p{pinid}r">{pinname}</td>')
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved
pinhtml.append(' </tr>')

pinhtml.append(' </table>')
Expand Down Expand Up @@ -303,9 +306,9 @@ def create_graph(self) -> Graph:
code_left_2 = f'{cable.name}:w{connection.via_port}:w'
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved
dot.edge(code_left_1, code_left_2)
if from_connector.show_name:
from_info = [str(connection.from_name), str(connection.from_port)]
from_info = [str(connection.from_name), str(self.connectors[connection.from_name].pins[connection.from_port])]
if from_connector.pinlabels:
pinlabel = from_connector.pinlabels[from_connector.pins.index(connection.from_port)]
pinlabel = from_connector.pinlabels[connection.from_port]
if pinlabel != '':
from_info.append(pinlabel)
from_string = ':'.join(from_info)
Expand All @@ -319,9 +322,9 @@ def create_graph(self) -> Graph:
code_right_2 = f'{connection.to_name}{to_port}:w'
formatc1702 marked this conversation as resolved.
Show resolved Hide resolved
dot.edge(code_right_1, code_right_2)
if to_connector.show_name:
to_info = [str(connection.to_name), str(connection.to_port)]
to_info = [str(connection.to_name), str(self.connectors[connection.to_name].pins[connection.to_port])]
if to_connector.pinlabels:
pinlabel = to_connector.pinlabels[to_connector.pins.index(connection.to_port)]
pinlabel = to_connector.pinlabels[connection.to_port]
if pinlabel != '':
to_info.append(pinlabel)
to_string = ':'.join(to_info)
Expand Down