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

formatted with autopep8

Browse Source
This commit is contained in:
Gabe R 2020-06-28 20:10:19 -05:00
parent 8326ddd462
commit 05fa4783ed
No known key found for this signature in database
GPG Key ID: F96D83D8D7ED67D0
1 changed files with 149 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/wireviz/wireviz.py
View File

@ -15,6 +15,7 @@ if __name__== '__main__':
from wireviz import wv_colors from wireviz import wv_colors
from wireviz.wv_helper import nested, int2tuple, awg_equiv, flatten2d, tuplelist2tsv from wireviz.wv_helper import nested, int2tuple, awg_equiv, flatten2d, tuplelist2tsv
class Harness: class Harness:
def __init__(self): def __init__(self):
@ -124,7 +125,8 @@ class Harness:
for k, c in self.cables.items(): for k, c in self.cables.items():
# a = attributes # a = attributes
a = ['{}x'.format(len(c.colors)) if c.show_wirecount else '', a = ['{}x'.format(len(c.colors)) if c.show_wirecount else '',
'{} {}{}'.format(c.gauge, c.gauge_unit, ' ({} AWG)'.format(awg_equiv(c.gauge)) if c.gauge_unit == 'mm\u00B2' and c.show_equiv else '') if c.gauge else '', # TODO: show equiv '{} {}{}'.format(c.gauge, c.gauge_unit, ' ({} AWG)'.format(awg_equiv(c.gauge)) if c.gauge_unit ==
'mm\u00B2' and c.show_equiv else '') if c.gauge else '', # TODO: show equiv
'+ S' if c.shield else '', '+ S' if c.shield else '',
'{} m'.format(c.length) if c.length > 0 else ''] '{} m'.format(c.length) if c.length > 0 else '']
a = list(filter(None, a)) a = list(filter(None, a))
@ -154,7 +156,8 @@ class Harness:
html = html + '<td>{}</td>'.format(bla) html = html + '<td>{}</td>'.format(bla)
html = html + '</tr>' html = html + '</tr>'
bgcolor = wv_colors.translate_color(x, 'hex') bgcolor = wv_colors.translate_color(x, 'hex')
html = html + '<tr><td colspan="{colspan}" cellpadding="0" height="6" bgcolor="{bgcolor}" border="2" sides="tb" port="{port}"></td></tr>'.format(colspan=len(p), bgcolor=bgcolor if bgcolor != '' else '#ffffff', port='w{}'.format(i)) html = html + '<tr><td colspan="{colspan}" cellpadding="0" height="6" bgcolor="{bgcolor}" border="2" sides="tb" port="{port}"></td></tr>'.format(
colspan=len(p), bgcolor=bgcolor if bgcolor != '' else '#ffffff', port='w{}'.format(i))
if c.shield: if c.shield:
p = ['<!-- s_in -->', 'Shield', '<!-- s_out -->'] p = ['<!-- s_in -->', 'Shield', '<!-- s_out -->']
@ -163,7 +166,8 @@ class Harness:
for bla in p: for bla in p:
html = html + '<td>{}</td>'.format(bla) html = html + '<td>{}</td>'.format(bla)
html = html + '</tr>' html = html + '</tr>'
html = html + '<tr><td colspan="{colspan}" cellpadding="0" height="6" border="2" sides="b" port="{port}"></td></tr>'.format(colspan=len(p), bgcolor=wv_colors.translate_color(x, 'hex'), port='ws') html = html + '<tr><td colspan="{colspan}" cellpadding="0" height="6" border="2" sides="b" port="{port}"></td></tr>'.format(
colspan=len(p), bgcolor=wv_colors.translate_color(x, 'hex'), port='ws')
html = html + '<tr><td>&nbsp;</td></tr>' # spacer at the end html = html + '<tr><td>&nbsp;</td></tr>' # spacer at the end
@ -181,7 +185,8 @@ class Harness:
if isinstance(x.via_port, int): # check if it's an actual wire and not a shield if isinstance(x.via_port, int): # check if it's an actual wire and not a shield
search_color = c.colors[x.via_port - 1] search_color = c.colors[x.via_port - 1]
if search_color in wv_colors.color_hex: if search_color in wv_colors.color_hex:
dot.attr('edge',color='#000000:{wire_color}:#000000'.format(wire_color=wv_colors.color_hex[search_color])) dot.attr('edge', color='#000000:{wire_color}:#000000'.format(
wire_color=wv_colors.color_hex[search_color]))
else: # color name not found else: # color name not found
dot.attr('edge', color='#000000:#ffffff:#000000') dot.attr('edge', color='#000000:#ffffff:#000000')
else: # it's a shield connection else: # it's a shield connection
@ -189,20 +194,25 @@ class Harness:
if x.from_port is not None: # connect to left if x.from_port is not None: # connect to left
from_ferrule = self.connectors[x.from_name].category == 'ferrule' from_ferrule = self.connectors[x.from_name].category == 'ferrule'
code_left_1 = '{from_name}{from_port}:e'.format(from_name=x.from_name, from_port=':p{}r'.format(x.from_port) if not from_ferrule else '') code_left_1 = '{from_name}{from_port}:e'.format(
code_left_2 = '{via_name}:w{via_wire}:w'.format(via_name=c.name, via_wire=x.via_port, via_subport='i' if c.show_pinout else '') from_name=x.from_name, from_port=':p{}r'.format(x.from_port) if not from_ferrule else '')
code_left_2 = '{via_name}:w{via_wire}:w'.format(
via_name=c.name, via_wire=x.via_port, via_subport='i' if c.show_pinout else '')
dot.edge(code_left_1, code_left_2) dot.edge(code_left_1, code_left_2)
from_string = '{}:{}'.format(x.from_name, x.from_port) if not from_ferrule else '' from_string = '{}:{}'.format(x.from_name, x.from_port) if not from_ferrule else ''
html = html.replace('<!-- {}_in -->'.format(x.via_port), from_string) html = html.replace('<!-- {}_in -->'.format(x.via_port), from_string)
if x.to_port is not None: # connect to right if x.to_port is not None: # connect to right
to_ferrule = self.connectors[x.to_name].category == 'ferrule' to_ferrule = self.connectors[x.to_name].category == 'ferrule'
code_right_1 = '{via_name}:w{via_wire}:e'.format(via_name=c.name, via_wire=x.via_port, via_subport='o' if c.show_pinout else '') code_right_1 = '{via_name}:w{via_wire}:e'.format(
code_right_2 = '{to_name}{to_port}:w'.format(to_name=x.to_name, to_port=':p{}l'.format(x.to_port) if not to_ferrule else '') via_name=c.name, via_wire=x.via_port, via_subport='o' if c.show_pinout else '')
code_right_2 = '{to_name}{to_port}:w'.format(
to_name=x.to_name, to_port=':p{}l'.format(x.to_port) if not to_ferrule else '')
dot.edge(code_right_1, code_right_2) dot.edge(code_right_1, code_right_2)
to_string = '{}:{}'.format(x.to_name, x.to_port) if not to_ferrule else '' to_string = '{}:{}'.format(x.to_name, x.to_port) if not to_ferrule else ''
html = html.replace('<!-- {}_out -->'.format(x.via_port), to_string) html = html.replace('<!-- {}_out -->'.format(x.via_port), to_string)
dot.node(c.name, label='<{html}>'.format(html=html), shape='box', style='filled,dashed' if c.category=='bundle' else '', margin='0', fillcolor='white') dot.node(c.name, label='<{html}>'.format(html=html), shape='box',
style='filled,dashed' if c.category == 'bundle' else '', margin='0', fillcolor='white')
return dot return dot
@ -236,7 +246,8 @@ class Harness:
for row in listy[1:]: for row in listy[1:]:
file.write('<tr>') file.write('<tr>')
for i, item in enumerate(row): for i, item in enumerate(row):
file.write('<td {align} style="border:1px solid #000000; padding: 4px">{content}</td>'.format(content=item, align='align="right"' if listy[0][i] == 'Qty' else '')) file.write('<td {align} style="border:1px solid #000000; padding: 4px">{content}</td>'.format(
content=item, align='align="right"' if listy[0][i] == 'Qty' else ''))
file.write('</tr>') file.write('</tr>')
file.write('</table>') file.write('</table>')
@ -254,24 +265,29 @@ class Harness:
designators = list(items.keys()) designators = list(items.keys())
designators.sort() designators.sort()
name = 'Connector{type}{subtype}{pincount}{color}'.format(type=', {}'.format(shared.type) if shared.type else '', name = 'Connector{type}{subtype}{pincount}{color}'.format(type=', {}'.format(shared.type) if shared.type else '',
subtype = ', {}'.format(shared.subtype) if shared.subtype else '', subtype=', {}'.format(
pincount = ', {} pins'.format(shared.pincount) if shared.category != 'ferrule' else '', shared.subtype) if shared.subtype else '',
pincount=', {} pins'.format(
shared.pincount) if shared.category != 'ferrule' else '',
color=', {}'.format(shared.color) if shared.color else '') color=', {}'.format(shared.color) if shared.color else '')
item = {'item': name, 'qty': len(designators), 'unit': '', 'designators': designators if shared.category != 'ferrule' else ''} item = {'item': name, 'qty': len(designators), 'unit': '',
'designators': designators if shared.category != 'ferrule' else ''}
bom_connectors.append(item) bom_connectors.append(item)
bom_connectors = sorted(bom_connectors, key=lambda k: k['item']) # https://stackoverflow.com/a/73050 bom_connectors = sorted(bom_connectors, key=lambda k: k['item']) # https://stackoverflow.com/a/73050
bom.extend(bom_connectors) bom.extend(bom_connectors)
# cables # cables
types = Counter([(v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) for v in self.cables.values()]) types = Counter([(v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) for v in self.cables.values()])
for type in types: for type in types:
items = {k: v for k, v in self.cables.items() if (v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) == type} items = {k: v for k, v in self.cables.items() if (
v.category, v.gauge, v.gauge_unit, v.wirecount, v.shield) == type}
shared = next(iter(items.values())) shared = next(iter(items.values()))
if shared.category != 'bundle': if shared.category != 'bundle':
designators = list(items.keys()) designators = list(items.keys())
designators.sort() designators.sort()
total_length = sum(i.length for i in items.values()) total_length = sum(i.length for i in items.values())
name = 'Cable, {wirecount}{gauge}{shield}'.format(wirecount=shared.wirecount, name = 'Cable, {wirecount}{gauge}{shield}'.format(wirecount=shared.wirecount,
gauge = ' x {} {}'.format(shared.gauge, shared.gauge_unit) if shared.gauge else ' wires', gauge=' x {} {}'.format(
shared.gauge, shared.gauge_unit) if shared.gauge else ' wires',
shield=' shielded' if shared.shield else '') shield=' shielded' if shared.shield else '')
item = {'item': name, 'qty': round(total_length, 3), 'unit': 'm', 'designators': designators} item = {'item': name, 'qty': round(total_length, 3), 'unit': 'm', 'designators': designators}
bom_cables.append(item) bom_cables.append(item)
@ -287,7 +303,8 @@ class Harness:
for bundle in items.values(): for bundle in items.values():
# add each wire from each bundle to the wirelist # add each wire from each bundle to the wirelist
for color in bundle.colors: for color in bundle.colors:
wirelist.append({'gauge': shared.gauge, 'gauge_unit': shared.gauge_unit, 'length': shared.length, 'color': color, 'designator': bundle.name}) wirelist.append({'gauge': shared.gauge, 'gauge_unit': shared.gauge_unit,
'length': shared.length, 'color': color, 'designator': bundle.name})
# join similar wires from all the bundles to a single BOM item # join similar wires from all the bundles to a single BOM item
types = Counter([(v['gauge'], v['gauge_unit'], v['color']) for v in wirelist]) types = Counter([(v['gauge'], v['gauge_unit'], v['color']) for v in wirelist])
for type in types: for type in types:
@ -319,6 +336,7 @@ class Harness:
bom_list.append(item_list) bom_list.append(item_list)
return bom_list return bom_list
@dataclass @dataclass
class Connector: class Connector:
name: str name: str
@ -369,6 +387,7 @@ class Connector:
def activate_pin(self, pin): def activate_pin(self, pin):
self.visible_pins[pin] = True self.visible_pins[pin] = True
@dataclass @dataclass
class Cable: class Cable:
name: str name: str
@ -438,6 +457,7 @@ class Cable:
# self.connections.append((from_name, from_pin[i], via_pin[i], to_name, to_pin[i])) # self.connections.append((from_name, from_pin[i], via_pin[i], to_name, to_pin[i]))
self.connections.append(Connection(from_name, from_pin[i], via_pin[i], to_name, to_pin[i])) self.connections.append(Connection(from_name, from_pin[i], via_pin[i], to_name, to_pin[i]))
@dataclass @dataclass
class Connection: class Connection:
from_name: Any from_name: Any
@ -446,6 +466,7 @@ class Connection:
to_name: Any to_name: Any
to_port: Any to_port: Any
def parse(yaml_input, file_out=None, generate_bom=False): def parse(yaml_input, file_out=None, generate_bom=False):
yaml_data = yaml.safe_load(yaml_input) yaml_data = yaml.safe_load(yaml_input)
@ -559,7 +580,6 @@ def parse(yaml_input, file_out=None, generate_bom=False):
cbl_con = check_designators([from_name, to_name], ('cables', 'connectors')) cbl_con = check_designators([from_name, to_name], ('cables', 'connectors'))
con_con = check_designators([from_name, to_name], ('connectors', 'connectors')) con_con = check_designators([from_name, to_name], ('connectors', 'connectors'))
fer_cbl = check_designators([from_name, to_name], ('ferrules', 'cables')) fer_cbl = check_designators([from_name, to_name], ('ferrules', 'cables'))
cbl_fer = check_designators([from_name, to_name], ('cables', 'ferrules')) cbl_fer = check_designators([from_name, to_name], ('cables', 'ferrules'))
@ -610,12 +630,12 @@ def parse(yaml_input, file_out=None, generate_bom=False):
else: else:
h.connect(None, None, cable_name, cable_pin, ferrule_id, 1) h.connect(None, None, cable_name, cable_pin, ferrule_id, 1)
else: else:
raise Exception('Wrong number of connection parameters') raise Exception('Wrong number of connection parameters')
h.output(filename=file_out, format=('png', 'svg'), gen_bom=generate_bom, view=False) h.output(filename=file_out, format=('png', 'svg'), gen_bom=generate_bom, view=False)
def parse_file(yaml_file, file_out=None, generate_bom=False): def parse_file(yaml_file, file_out=None, generate_bom=False):
with open(yaml_file, 'r') as file: with open(yaml_file, 'r') as file:
yaml_input = file.read() yaml_input = file.read()
@ -645,6 +665,7 @@ def parse_cmdline():
return args return args
def main(): def main():
args = parse_cmdline() args = parse_cmdline()
@ -674,5 +695,6 @@ def main():
parse(yaml_input, file_out=file_out, generate_bom=args.generate_bom) parse(yaml_input, file_out=file_out, generate_bom=args.generate_bom)
if __name__ == '__main__': if __name__ == '__main__':
main() main()