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

Simplify several function calls and typehint qty multipliers

Browse Source
This commit is contained in:
Tyler Ward 2020-10-01 23:07:26 +01:00
parent abcccbd360
commit 3faaff6ebc
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wireviz/DataClasses.py
View File

@ -7,6 +7,8 @@ from pathlib import Path
from wireviz.wv_helper import int2tuple, aspect_ratio
from wireviz import wv_colors
ConnectorMultiplier = str # = Literal['pincount', 'populated']
CableMultiplier = str # = Literal['wirecount', 'terminations', 'length', 'total_length']
@dataclass
class Image:
@ -52,7 +54,7 @@ class AdditionalComponent:
pn: Optional[str] = None
qty: float = 1
unit: Optional[str] = None
qty_multiplier: Optional[str] = None
qty_multiplier: Union[ConnectorMultiplier, CableMultiplier, None] = None
def long_name(self) -> str:
name_subtype = f', {self.subtype}' if self.subtype else ''

33
src/wireviz/Harness.py
View File

@ -104,16 +104,15 @@ class Harness:
'<!-- connector table -->' if connector.style != 'simple' else None,
[html_image(connector.image)],
[html_caption(connector.image)]]
if connector.additional_components is not None:
if connector.additional_components:
rows.append(["Additional components"])
for extra in connector.additional_components:
qty = extra.qty
qty *= calculate_qty_multiplier_connector(extra.qty_multiplier, connector)
qty = extra.qty * calculate_qty_multiplier_connector(extra.qty_multiplier, connector)
if(self.mini_bom_mode):
id = self.get_bom_index(extra.long_name(), extra.unit, extra.manufacturer, extra.mpn, extra.pn)
rows.append(html_line_breaks(component_table_entry(f'{id} ({extra.type.capitalize()})', qty, extra.unit)))
rows.append(component_table_entry(f'{id} ({extra.type.capitalize()})', qty, extra.unit))
else:
rows.append(html_line_breaks(extra.long_name(), qty, extra.get.unit, extra.pn, extra.manufacturer, extra.mpn))
rows.append(component_table_entry(extra.long_name(), qty, extra.unit, extra.pn, extra.manufacturer, extra.mpn))
rows.append([html_line_breaks(connector.notes)])
html.extend(nested_html_table(rows))
@ -188,16 +187,15 @@ class Harness:
[html_image(cable.image)],
[html_caption(cable.image)]]
if len(cable.additional_components) > 0:
if cable.additional_components:
rows.append(["Additional components"])
for extra in cable.additional_components:
qty = extra.qty
qty *= calculate_qty_multiplier_cable(extra.qty_multiplier, cable)
qty = extra.qty * calculate_qty_multiplier_cable(extra.qty_multiplier, cable)
if(self.mini_bom_mode):
id = self.get_bom_index(extra.long_name(), extra.unit, extra.manufacturer, extra.mpn, extra.pn)
rows.append(html_line_breaks(component_table_entry(f'{id} ({extra.type.capitalize()})', qty, extra.unit)))
rows.append(component_table_entry(f'{id} ({extra.type.capitalize()})', qty, extra.unit))
else:
rows.append(html_line_breaks(component_table_entry(extra.long_name(), qty, extra.unit, extra.pn, extra.manufacturer, extra.mpn)))
rows.append(component_table_entry(extra.long_name(), qty, extra.unit, extra.pn, extra.manufacturer, extra.mpn))
rows.append([html_line_breaks(cable.notes)])
html.extend(nested_html_table(rows))
@ -356,7 +354,7 @@ class Harness:
def bom(self):
# if the bom has previously been generated then return the generated bom
if len(self._bom) > 0:
if self._bom:
return self._bom
bom_items = []
@ -373,8 +371,7 @@ class Harness:
bom_items.append(item)
for part in connector.additional_components:
qty = part.qty
qty *= calculate_qty_multiplier_connector(part.qty_multiplier, connector)
qty = part.qty * calculate_qty_multiplier_connector(part.qty_multiplier, connector)
bom_items.append(
{
'item': part.long_name(),
@ -404,16 +401,15 @@ class Harness:
else:
# add each wire from the bundle to the bom
for index, color in enumerate(cable.colors, 0):
gauge_color = f', {color}' if color else ''
name = f'Wire{cable_type}{gauge_name}{gauge_color}'
wire_color = f', {color}' if color else ''
name = f'Wire{cable_type}{gauge_name}{wire_color}'
item = {'item': name, 'qty': cable.length, 'unit': 'm', 'designators': cable.name,
'manufacturer': remove_line_breaks(index_if_list(cable.manufacturer, index)),
'mpn': remove_line_breaks(index_if_list(cable.mpn, index)), 'pn': index_if_list(cable.pn, index)}
bom_items.append(item)
for part in cable.additional_components:
qty = part.qty
qty *= calculate_qty_multiplier_cable(part.qty_multiplier, cable)
qty = part.qty * calculate_qty_multiplier_cable(part.qty_multiplier, cable)
bom_items.append(
{
'item': part.long_name(),
@ -427,8 +423,7 @@ class Harness:
)
for item in self.additional_bom_items:
name = item['description'] if item.get('description', None) else ''
item = {'item': name, 'qty': item.get('qty'), 'unit': item.get('unit'), 'designators': item.get('designators'),
item = {'item': item.get('description', ''), 'qty': item.get('qty'), 'unit': item.get('unit'), 'designators': item.get('designators'),
'manufacturer': item.get('manufacturer'), 'mpn': item.get('mpn'), 'pn': item.get('pn')}
bom_items.append(item)

1
src/wireviz/wv_helper.py
View File

@ -197,6 +197,7 @@ def component_table_entry(type, qty, unit=None, pn=None, manufacturer=None, mpn=
output += ', '
if manufacturer_str:
output += manufacturer_str
output = html_line_breaks(output)
# format the above output as left aligned text in a single visable cell
return f'<table border="0" cellspacing="0" cellpadding="3" cellborder="1"><tr><td align="left" balign="left">{output}</td></tr></table>'