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

Add html sttribute to Harness, using it in the parse function

Browse Source
This commit is contained in:
Jason R. Jones 2020-07-24 20:01:57 -04:00
parent bbf92bb5fe
commit 126f525c18
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/wireviz/Harness.py
View File

@ -288,6 +288,46 @@ class Harness:
data.seek(0) data.seek(0)
return data.read() return data.read()
@property
def html(self):
self.create_graph()
bom_list = self.bom_list()
string = ''
string += '<!DOCTYPE html>\n'
string += f'<html><head><meta charset="UTF-8"></head><body style="font-family:Arial;background-color:{wv_colors.COLOR_BACKGROUND}">'
string += '<h1>Diagram</h1>'
svg = self.svg.decode('utf-8')
svg = re.sub(
'^<[?]xml [^?>]*[?]>[^<]*<!DOCTYPE [^>]*>',
'<!-- XML and DOCTYPE declarations from SVG file removed -->',
svg)
for svgdata in svg:
string += svgdata
string += '<h1>Bill of Materials</h1>'
listy = flatten2d(bom_list)
string += '<table style="border:1px solid #000000; font-size: 14pt; border-spacing: 0px">'
string += '<tr>'
for item in listy[0]:
string += f'<th align="left" style="border:1px solid #000000; padding: 8px">{item}</th>'
string += '</tr>'
for row in listy[1:]:
string += '<tr>'
for i, item in enumerate(row):
item_str = item.replace('\u00b2', '&sup2;')
align = 'align="right"' if listy[0][i] == 'Qty' else ''
string += f'<td {align} style="border:1px solid #000000; padding: 4px">{item_str}</td>'
string += '</tr>'
string += '</table>'
string += '</body></html>'
return bytes(string, encoding='utf-8')
def output(self, filename: (str, Path), view: bool = False, cleanup: bool = True, fmt: tuple = ('pdf', )) -> None: def output(self, filename: (str, Path), view: bool = False, cleanup: bool = True, fmt: tuple = ('pdf', )) -> None:
# graphical output # graphical output
graph = self.create_graph() graph = self.create_graph()

1
src/wireviz/bom_helper.py
View File

@ -26,6 +26,7 @@ _tsv_formats = { EXCEL_TSV, WIREVIZ_TSV }
_csv_ext = '.bom.csv' _csv_ext = '.bom.csv'
_tsv_ext = '.bom.tsv' _tsv_ext = '.bom.tsv'
def generate_bom_outputs(base_filename, bomdata, formats=None): def generate_bom_outputs(base_filename, bomdata, formats=None):
if formats is None: if formats is None:
formats = [EXCEL_CSV, WIREVIZ_TSV] formats = [EXCEL_CSV, WIREVIZ_TSV]

2
src/wireviz/wireviz.py
View File

@ -181,6 +181,8 @@ def parse(yaml_input: str, file_out: (str, Path) = None, return_types: (None, st
returns.append(harness.png) returns.append(harness.png)
if rt == 'svg': if rt == 'svg':
returns.append(harness.svg) returns.append(harness.svg)
if rt == 'html':
returns.append(harness.html)
if rt == 'harness': if rt == 'harness':
returns.append(harness) returns.append(harness)