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

Allow wires to hide pinout

Browse Source
This commit is contained in:
Daniel Rojas 2020-05-22 16:17:54 +02:00
parent abba76bba4
commit 485f7af747
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test.py
View File

@ -10,7 +10,7 @@ PINOUT_SPI_DATAONLY = ('MISO','MOSI','SCK')
# example 1
X1 = wireviz.Node('X1', type='D-Sub DE-9', gender='female', pinout=PINOUT_SERIAL, ports_right=True)
X2 = wireviz.Node('X2', type='Molex KK 254', gender='female', num_pins=6, ports_left=True)
W1 = wireviz.Cable('W1', mm2=0.25, length=0.2, show_name=False, num_wires=3, color_code='DIN', shield=True)
W1 = wireviz.Cable('W1', mm2=0.25, length=0.2, show_name=False, show_pinout=False, num_wires=3, color_code='DIN', shield=True)
# Option 1: define wires and shield in one line
# W1.connect(X1,(5,2,3,5),(1,2,3,'s'),X2,(1,3,2,None))
# Option 2: define wires and shield separately

17
src/wireviz.py
View File

@ -110,12 +110,13 @@ class Node:
class Cable:
def __init__(self, name, mm2=0, awg=0, length=0, show_name=False, num_wires=None, colors=None, color_code=None, shield=False):
def __init__(self, name, mm2=0, awg=0, length=0, show_name=False, show_pinout=False, num_wires=None, colors=None, color_code=None, shield=False):
self.name = name
self.mm2 = mm2
self.awg = awg
self.length = length
self.show_name = show_name
self.show_pinout = show_pinout
self.shield = shield
self.connections = []
if color_code is None and colors is None:
@ -193,6 +194,7 @@ class Cable:
s = s + '{'
# print pinout
if self.show_pinout:
s = s + '{'
l = []
for i,x in enumerate(self.colors,1):
@ -203,11 +205,20 @@ class Cable:
s = s + '} | '
s = s + '{'
if self.show_pinout:
s = s + '|'.join(self.colors)
if self.shield == True:
s = s + '|Shield'
else:
l = []
for i,x in enumerate(self.colors,1):
l.append('<w{wireno}>{wirecolor}'.format(wireno=i,wirecolor=x))
s = s + '|'.join(l)
if self.shield == True:
s = s + '|<ws>Shield'
s = s + '}'
if self.show_pinout:
s = s + ' | {'
l = []
for i,x in enumerate(self.colors,1):
@ -228,10 +239,10 @@ class Cable:
if search_color in color_dict:
s = s + 'edge[color="#000000:{wire_color}:#000000"] '.format(wire_color=color_dict[search_color])
if x[1] is not None:
t = '{from_name}:p{from_port} -> {via_name}:w{via_wire}i; '.format(from_name=x[0],from_port=x[1],via_name=self.name, via_wire=x[2])
t = '{from_name}:p{from_port} -> {via_name}:w{via_wire}{via_subport}; '.format(from_name=x[0],from_port=x[1],via_name=self.name, via_wire=x[2], via_subport='i' if self.show_pinout == True else '')
s = s + t
if x[4] is not None:
t = '{via_name}:w{via_wire}o -> {to_name}:p{to_port}'.format(via_name=self.name, via_wire=x[2],to_name=x[3],to_port=x[4])
t = '{via_name}:w{via_wire}{via_subport} -> {to_name}:p{to_port}'.format(via_name=self.name, via_wire=x[2],to_name=x[3],to_port=x[4], via_subport='o' if self.show_pinout == True else '')
s = s + t
s = s + '}\n'
s = s + '}'