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

Simplify connector loop code

Browse Source
This commit is contained in:
Daniel Rojas 2020-07-11 11:53:29 +02:00
parent cf6d3676c4
commit 9e11051cac
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wireviz/DataClasses.py
View File

@ -25,11 +25,11 @@ class Connector:
show_pincount: bool = True show_pincount: bool = True
hide_disconnected_pins: bool = False hide_disconnected_pins: bool = False
autogenerate: bool = False autogenerate: bool = False
loops: List[Any] = field(default_factory=list)
def __post_init__(self): def __post_init__(self):
self.ports_left = False self.ports_left = False
self.ports_right = False self.ports_right = False
self.loops = []
self.visible_pins = {} self.visible_pins = {}
if self.pincount is None: if self.pincount is None:
@ -55,11 +55,12 @@ class Connector:
if len(self.pinnumbers) != len(set(self.pinnumbers)): if len(self.pinnumbers) != len(set(self.pinnumbers)):
raise Exception('Pin numbers are not unique') raise Exception('Pin numbers are not unique')
def loop(self, from_pin, to_pin): for loop in self.loops:
self.loops.append((from_pin, to_pin)) # TODO: check that pins to connect actually exist
if self.hide_disconnected_pins: # TODO: allow using pin labels in addition to pin numbers, just like when defining regular connections
self.visible_pins[from_pin] = True # TODO: include properties of wire used to create the loop
self.visible_pins[to_pin] = True if len(loop) != 2:
raise Exception('Loops must be between exactly two pins!')
def activate_pin(self, pin): def activate_pin(self, pin):
self.visible_pins[pin] = True self.visible_pins[pin] = True

4
src/wireviz/Harness.py
View File

@ -22,9 +22,6 @@ class Harness:
def add_cable(self, name, *args, **kwargs): def add_cable(self, name, *args, **kwargs):
self.cables[name] = Cable(name, *args, **kwargs) self.cables[name] = Cable(name, *args, **kwargs)
def loop(self, connector_name, from_pin, to_pin):
self.connectors[connector_name].loop(from_pin, to_pin)
def connect(self, from_name, from_pin, via_name, via_pin, to_name, to_pin): def connect(self, from_name, from_pin, via_name, via_pin, to_name, to_pin):
for (name, pin) in zip([from_name, to_name], [from_pin, to_pin]): # check from and to connectors for (name, pin) in zip([from_name, to_name], [from_pin, to_pin]): # check from and to connectors
@ -46,7 +43,6 @@ class Harness:
from_pin = pin from_pin = pin
if name == to_name: if name == to_name:
to_pin = pin to_pin = pin
# TODO: what happens with loops?
if not pin in connector.pinnumbers: if not pin in connector.pinnumbers:
raise Exception(f'{name}:{pin} not found.') raise Exception(f'{name}:{pin} not found.')