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

Refactor connector GraphViz code generation (#66)

Browse Source
This commit is contained in:
Daniel Rojas 2020-07-05 21:36:13 +02:00
parent 12d3002af8
commit 7e54c7aaef
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/wireviz/Harness.py
View File

@ -92,7 +92,6 @@ class Harness:
f'IPN: {connector.internal_part_number}' if connector.internal_part_number else None], f'IPN: {connector.internal_part_number}' if connector.internal_part_number else None],
[html_line_breaks(connector.notes)]] [html_line_breaks(connector.notes)]]
rows = [list(filter(None, row)) for row in rows] # remove missing attributes rows = [list(filter(None, row)) for row in rows] # remove missing attributes
html = nested_html_table(rows) html = nested_html_table(rows)
if connector.color: # add color bar next to color info, if present if connector.color: # add color bar next to color info, if present
@ -102,24 +101,37 @@ class Harness:
dot.node(key, label=f'<{html}>', shape='none', margin='0', style='filled', fillcolor='white') dot.node(key, label=f'<{html}>', shape='none', margin='0', style='filled', fillcolor='white')
else: # not a ferrule else: # not a ferrule
identification = [connector.manufacturer,
f'MPN: {connector.manufacturer_part_number}' if connector.manufacturer_part_number else '',
f'IPN: {connector.internal_part_number}' if connector.internal_part_number else '']
attributes = [graphviz_line_breaks(connector.type), rows = [[connector.name if connector.show_name else None],
graphviz_line_breaks(connector.subtype), [html_line_breaks(connector.type),
f'{connector.pincount}-pin' if connector.show_pincount else''] html_line_breaks(connector.subtype),
pinouts = [[], [], []] f'{connector.pincount}-pin' if connector.show_pincount else None],
[connector.manufacturer,
f'MPN: {connector.manufacturer_part_number}' if connector.manufacturer_part_number else None,
f'IPN: {connector.internal_part_number}' if connector.internal_part_number else None],
'<!-- connector table -->',
[html_line_breaks(connector.notes)]]
html = nested_html_table(rows)
pinouts = []
for pinnumber, pinname in zip(connector.pinnumbers, connector.pinout): for pinnumber, pinname in zip(connector.pinnumbers, connector.pinout):
if connector.hide_disconnected_pins and not connector.visible_pins.get(pinnumber, False): if connector.hide_disconnected_pins and not connector.visible_pins.get(pinnumber, False):
continue continue
pinouts[1].append(pinname) pinouts.append([f'<td port="p{pinnumber}l">{pinnumber}</td>' if connector.ports_left else None,
if connector.ports_left: f'<td>{pinname}</td>' if pinname else '',
pinouts[0].append(f'<p{pinnumber}l>{pinnumber}') f'<td port="p{pinnumber}r">{pinnumber}</td>' if connector.ports_right else None])
if connector.ports_right:
pinouts[2].append(f'<p{pinnumber}r>{pinnumber}') pinhtml = '<table border="0" cellspacing="0" cellpadding="3" cellborder="1">'
label = [connector.name if connector.show_name else '', identification, attributes, pinouts, graphviz_line_breaks(connector.notes)] for i, pin in enumerate(pinouts):
dot.node(key, label=nested(label)) pinhtml = f'{pinhtml}<tr>'
for column in pin:
if column is not None:
pinhtml = f'{pinhtml}{column}'
pinhtml = f'{pinhtml}</tr>'
pinhtml = f'{pinhtml}</table>'
html = html.replace('<!-- connector table -->', pinhtml)
dot.node(key, label=f'<{html}>', shape='none', margin='0', style='filled', fillcolor='white')
if len(connector.loops) > 0: if len(connector.loops) > 0:
dot.attr('edge', color='#000000:#ffffff:#000000') dot.attr('edge', color='#000000:#ffffff:#000000')

18
src/wireviz/wv_helper.py
View File

@ -45,16 +45,20 @@ def nested(inp):
return '|'.join(l) return '|'.join(l)
def nested_html_table(rows): def nested_html_table(rows):
# input: list of lists # input: list, each item may be scalar or list
# output: a parent table with one child table per parent list item # output: a parent table with one child table per parent item that is list, and one cell per parent item that is scalar
# purpose: create the appearance of one table, where cell widths are independent between rows # purpose: create the appearance of one table, where cell widths are independent between rows
html = '<table border="0" cellspacing="0" cellpadding="0">' html = '<table border="0" cellspacing="0" cellpadding="0">'
for row in rows: for row in rows:
if len(row) > 0: if isinstance(row, List):
html = f'{html}<tr><td><table border="0" cellspacing="0" cellpadding="3" cellborder="1"><tr>' if len(row) > 0 and any(row):
for cell in row: html = f'{html}<tr><td><table border="0" cellspacing="0" cellpadding="3" cellborder="1"><tr>'
html = f'{html}<td balign="left">{cell}</td>' for cell in row:
html = f'{html}</tr></table></td></tr>' if cell is not None:
html = f'{html}<td balign="left">{cell}</td>'
html = f'{html}</tr></table></td></tr>'
else:
html = f'{html}<tr><td>{row}</td></tr>'
html = f'{html}</table>' html = f'{html}</table>'
return html return html