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

Ensure items in a connection set alternate between connectors and cables

Browse Source
This commit is contained in:
Daniel Rojas 2020-07-11 11:25:59 +02:00
parent b988e9b063
commit cf6d3676c4
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/wireviz/wireviz.py
View File

@ -67,19 +67,46 @@ def parse(yaml_input, file_out=None, generate_bom=False, return_types: (None, st
autogenerated_ids = {} autogenerated_ids = {}
for connection in yaml_data['connections']: for connection in yaml_data['connections']:
# TODO: check that items are of alternating type CONNECTOR/FERRULE/FERRULE_LIST and CABLE/WIRE # find first component (potentially nested inside list or dict)
# TODO: special case: loops! first_item = connection[0]
if isinstance(first_item, list):
first_item = first_item[0]
elif isinstance(first_item, dict):
first_item = list(first_item.keys())[0]
elif isinstance(first_item, str):
pass
# check which section the first item belongs to
alternating_sections = ['connectors','cables']
for index, section in enumerate(alternating_sections):
if first_item in yaml_data[section]:
expected_index = index
break
else:
raise Exception('First item not found anywhere.')
expected_index = 1 - expected_index # flip once since it is flipped back at the *beginning* of every loop
# check that all iterable items (lists and dicts) are the same length # check that all iterable items (lists and dicts) are the same length
# and that they are alternating between connectors and cables/bundles, starting with either
itemcount = None itemcount = None
for item in connection: for item in connection:
expected_index = 1 - expected_index # make sure items alternate between connectors and cables
expected_section = alternating_sections[expected_index]
if isinstance(item, list): if isinstance(item, list):
itemcount_new = len(item) itemcount_new = len(item)
for subitem in item:
if not subitem in yaml_data[expected_section]:
raise Exception(f'{subitem} is not in {expected_section}')
elif isinstance(item, dict): elif isinstance(item, dict):
if len(item.keys()) != 1: if len(item.keys()) != 1:
raise Exception('Dicts may contain only one item here!') raise Exception('Dicts may contain only one key here!')
itemcount_new = len(expand(list(item.values())[0])) itemcount_new = len(expand(list(item.values())[0]))
subitem = list(item.keys())[0]
if not subitem in yaml_data[expected_section]:
raise Exception(f'{subitem} is not in {expected_section}')
elif isinstance(item, str): elif isinstance(item, str):
if not item in yaml_data[expected_section]:
raise Exception(f'{item} is not in {expected_section}')
continue continue
if itemcount is not None and itemcount_new != itemcount: if itemcount is not None and itemcount_new != itemcount:
raise Exception('All lists and dict lists must be the same length!') raise Exception('All lists and dict lists must be the same length!')
@ -119,12 +146,10 @@ def parse(yaml_input, file_out=None, generate_bom=False, return_types: (None, st
for pin in pins: for pin in pins:
sublist.append([id, pin]) sublist.append([id, pin])
connection_list.append(sublist) connection_list.append(sublist)
elif False: # TODO: placeholer; a loop inside a connector was specified
pass
else: else:
raise Exception('Unexpected item in connection list') raise Exception('Unexpected item in connection list')
# actually connect things using connection list # actually connect components using connection list
for i, item in enumerate(connection_list): for i, item in enumerate(connection_list):
id = item[0][0] # TODO: make more elegant/robust/pythonic id = item[0][0] # TODO: make more elegant/robust/pythonic
if id in harness.cables: if id in harness.cables: