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

Simplify processing input file sections

Browse Source
This commit is contained in:
Daniel Rojas 2020-05-28 18:46:25 +02:00
parent ab922928de
commit 77a69d2362
1 changed files with 106 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
src/yaml2wireviz.py
View File

@ -47,151 +47,136 @@ with open(filename, 'r') as stream:
print(exc) print(exc)
h = wireviz.Harness() h = wireviz.Harness()
# add nodes
if 'nodes' in input and type(input['nodes']) == dict:
if len(input['nodes']) > 0:
for k, o in input['nodes'].items():
h.add_node(name=k, **o)
else:
print('Node list empty')
else:
print('No node list found')
input['nodes'] = {}
# add wires # add items
if 'wires' in input and type(input['wires']) == dict: sections = ['nodes','wires','ferrules','connections']
if len(input['wires']) > 0: types = [dict, dict, dict, list]
for k, o in input['wires'].items(): for sec, ty in zip(sections, types):
h.add_cable(name=k, **o) if sec in input and type(input[sec]) == ty:
if len(input[sec]) > 0:
if ty == dict:
for k, o in input[sec].items():
if sec == 'nodes':
h.add_node(name=k, **o)
elif sec == 'wires':
h.add_cable(name=k, **o)
elif sec == 'ferrules':
pass
else:
print('{} section empty'.format(sec))
else: else:
print('Wire list empty') print('No {} section found'.format(sec))
else: if ty == dict:
print('No wire list found') input[sec] = {}
input['wires'] = {} elif ty == list:
input[sec] = []
if 'ferrules' in input and type(input['ferrules']) == dict:
if len(input['wires']) > 0:
pass
else:
print('Ferrule list empty')
else:
print('No ferrule list found')
input['ferrules'] = {}
# add connections # add connections
if 'connections' in input: ferrule_counter = 0
if len(input['connections']) > 0: for con in input['connections']:
ferrule_counter = 0 if len(con) == 3: # format: connector -- wire -- conector
conlist = input['connections']
for con in conlist:
if len(con) == 3: # format: connector -- wire -- conector
for c in con: for c in con:
if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator
raise Exception('Too many keys') raise Exception('Too many keys')
from_name = list(con[0].keys())[0] from_name = list(con[0].keys())[0]
via_name = list(con[1].keys())[0] via_name = list(con[1].keys())[0]
to_name = list(con[2].keys())[0] to_name = list(con[2].keys())[0]
if not check_designators([from_name,via_name,to_name],('nodes','wires','nodes')): if not check_designators([from_name,via_name,to_name],('nodes','wires','nodes')):
raise Exception('Bad connection definition (3)') raise Exception('Bad connection definition (3)')
from_pins = expand(con[0][from_name]) from_pins = expand(con[0][from_name])
via_pins = expand(con[1][via_name]) via_pins = expand(con[1][via_name])
to_pins = expand(con[2][to_name]) to_pins = expand(con[2][to_name])
if len(from_pins) != len(via_pins) or len(via_pins) != len(to_pins): if len(from_pins) != len(via_pins) or len(via_pins) != len(to_pins):
raise Exception('List length mismatch') raise Exception('List length mismatch')
for (from_pin, via_pin, to_pin) in zip(from_pins, via_pins, to_pins): for (from_pin, via_pin, to_pin) in zip(from_pins, via_pins, to_pins):
h.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin) h.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin)
elif len(con) == 2: elif len(con) == 2:
for c in con: for c in con:
if type(c) is dict: if type(c) is dict:
if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator
raise Exception('Too many keys') raise Exception('Too many keys')
# hack to make the format for ferrules compatible with the formats for connectors and wires # hack to make the format for ferrules compatible with the formats for connectors and wires
if type(con[0]) == str: if type(con[0]) == str:
name = con[0] name = con[0]
con[0] = {} con[0] = {}
con[0][name] = name con[0][name] = name
if type(con[1]) == str: if type(con[1]) == str:
name = con[1] name = con[1]
con[1] = {} con[1] = {}
con[1][name] = name con[1][name] = name
from_name = list(con[0].keys())[0] from_name = list(con[0].keys())[0]
to_name = list(con[1].keys())[0] to_name = list(con[1].keys())[0]
n_w = check_designators([from_name, to_name],('nodes','wires')) n_w = check_designators([from_name, to_name],('nodes','wires'))
w_n = check_designators([from_name, to_name],('wires','nodes')) w_n = check_designators([from_name, to_name],('wires','nodes'))
n_n = check_designators([from_name, to_name],('nodes','nodes')) n_n = check_designators([from_name, to_name],('nodes','nodes'))
f_w = check_designators([from_name, to_name],('ferrules','wires')) f_w = check_designators([from_name, to_name],('ferrules','wires'))
w_f = check_designators([from_name, to_name],('wires','ferrules')) w_f = check_designators([from_name, to_name],('wires','ferrules'))
if not n_w and not w_n and not n_n and not f_w and not w_f: if not n_w and not w_n and not n_n and not f_w and not w_f:
raise Exception('Wrong designators') raise Exception('Wrong designators')
from_pins = expand(con[0][from_name]) from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name]) to_pins = expand(con[1][to_name])
if n_w or w_n or n_n: if n_w or w_n or n_n:
if len(from_pins) != len(to_pins): if len(from_pins) != len(to_pins):
raise Exception('List length mismatch') raise Exception('List length mismatch')
if n_w or w_n: if n_w or w_n:
for (from_pin, to_pin) in zip(from_pins, to_pins): for (from_pin, to_pin) in zip(from_pins, to_pins):
if n_w: if n_w:
h.connect(from_name, from_pin, to_name, to_pin, None, None) h.connect(from_name, from_pin, to_name, to_pin, None, None)
else: # w_n else: # w_n
h.connect(None, None, from_name, from_pin, to_name, to_pin) h.connect(None, None, from_name, from_pin, to_name, to_pin)
elif n_n: elif n_n:
con_name = list(con[0].keys())[0] con_name = list(con[0].keys())[0]
from_pins = expand(con[0][from_name]) from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name]) to_pins = expand(con[1][to_name])
for (from_pin, to_pin) in zip(from_pins, to_pins):
h.loop(con_name, from_pin, to_pin)
if f_w or w_f:
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
if f_w:
ferrule_name = from_name
wire_name = to_name
wire_pins = to_pins
else:
ferrule_name = to_name
wire_name = from_name
wire_pins = from_pins
ferrule = input['ferrules'][ferrule_name]
for wire_pin in wire_pins:
ferrule_counter = ferrule_counter + 1
ferrule_id = 'F{}'.format(ferrule_counter)
h.add_node(ferrule_id, type=ferrule.get('type'),
gender=ferrule.get('gender'),
num_pins=ferrule.get('num_pins'),
pinout=ferrule.get('pinout'))
if f_w:
h.connect(ferrule_id, 1, wire_name, wire_pin, None, None)
else:
h.connect(None, None, wire_name, wire_pin, ferrule_id, 1)
for (from_pin, to_pin) in zip(from_pins, to_pins):
h.loop(con_name, from_pin, to_pin)
if f_w or w_f:
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
if f_w:
ferrule_name = from_name
wire_name = to_name
wire_pins = to_pins
else: else:
raise Exception('Wrong number of connection parameters') ferrule_name = to_name
wire_name = from_name
wire_pins = from_pins
ferrule = input['ferrules'][ferrule_name]
for wire_pin in wire_pins:
ferrule_counter = ferrule_counter + 1
ferrule_id = 'F{}'.format(ferrule_counter)
h.add_node(ferrule_id, type=ferrule.get('type'),
gender=ferrule.get('gender'),
num_pins=ferrule.get('num_pins'),
pinout=ferrule.get('pinout'))
if f_w:
h.connect(ferrule_id, 1, wire_name, wire_pin, None, None)
else:
h.connect(None, None, wire_name, wire_pin, ferrule_id, 1)
else: else:
print('Connection list empty') raise Exception('Wrong number of connection parameters')
else:
print('No connection list found')
input['connections'] = {}
h.output(filename='output', format=('png','svg'), view=False) h.output(filename='output', format=('png','svg'), view=False)