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

Improve color code handling

Browse Source
This commit is contained in:
Daniel Rojas 2020-05-22 20:02:20 +02:00
parent 5a2f3d7ed0
commit 5fc93a8bce
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/example3.py
View File

@ -8,9 +8,9 @@ Harness.add(Node('X2', num_pins=10, ports_left=True))
Harness.add(Cable('W1', num_wires=10, color_code='IEC')) Harness.add(Cable('W1', num_wires=10, color_code='IEC'))
Harness.objects['W1'].connect_all_straight('X1','X2') Harness.objects['W1'].connect_all_straight('X1','X2')
Harness.add(Node('X3', num_pins=10, ports_right=True)) Harness.add(Node('X3', num_pins=20, ports_right=True))
Harness.add(Node('X4', num_pins=10, ports_left=True)) Harness.add(Node('X4', num_pins=20, ports_left=True))
Harness.add(Cable('W2', num_wires=10, color_code='DIN')) Harness.add(Cable('W2', num_wires=20, color_code='DIN'))
Harness.objects['W2'].connect_all_straight('X3','X4') Harness.objects['W2'].connect_all_straight('X3','X4')
Harness.graphviz() Harness.graphviz()

13
src/wireviz.py
View File

@ -1,6 +1,7 @@
COLOR_CODE_DIN = ['WH','BN','GN','YE','GY','PK','BU','RD','BK','VT'] COLOR_CODES = {'DIN': ['WH','BN','GN','YE','GY','PK','BU','RD','BK','VT'],
COLOR_CODE_IEC = ['BN','RD','OG','YE','GN','BU','VT','GY','WH','BK'] 'IEC': ['BN','RD','OG','YE','GN','BU','VT','GY','WH','BK'],
'BW': ['BK','WH']}
color_hex = { color_hex = {
'BK': '#000000', 'BK': '#000000',
@ -174,12 +175,8 @@ class Cable:
if num_wires is None: if num_wires is None:
raise Exception('Unknown number of wires') raise Exception('Unknown number of wires')
else: else:
# TODO: Loop through colors if num_wires > len(COLOR_CODE_XXX) # choose color code
if color_code == 'DIN': if color_code not in COLOR_CODES:
self.colors = tuple(COLOR_CODE_DIN[:num_wires])
elif color_code == 'IEC':
self.colors = tuple(COLOR_CODE_IEC[:num_wires])
else:
raise Exception('Unknown color code') raise Exception('Unknown color code')
else: else:
if num_wires is None: if num_wires is None: