inside a list are injected into to the preceeding tag
+ html = []
+ html.append('')
+ for row in rows:
+ if isinstance(row, List):
+ if len(row) > 0 and any(row):
+ html.append(' ')
+ html.append(' ')
+ for cell in row:
+ if cell is not None:
+ # Inject attributes to the preceeding | tag where needed
+ html.append(f' | {cell} | '.replace('>
')
+ html.append(' | ')
+ elif row is not None:
+ html.append(' | ')
+ html.append(f' {row}')
+ html.append(' | ')
+ html.append(' ')
+ return html
+
+def html_colorbar(color):
+ return f'' if color else None
+
+def html_image(image):
+ from wireviz.DataClasses import Image
+ if not image:
+ return None
+ # The leading attributes belong to the preceeding tag. See where used below.
+ html = f'{html_size_attr(image)}> '
+ if image.fixedsize:
+ # Close the preceeding tag and enclose the image cell in a table without
+ # borders to avoid narrow borders when the fixed width < the node width.
+ html = f'''>
+
+ '''
+ return f'''{html_line_breaks(image.caption)}' if image and image.caption else None
+
+def html_size_attr(image):
+ from wireviz.DataClasses import Image
+ # Return Graphviz HTML attributes to specify minimum or fixed size of a TABLE or TD object
+ return ((f' width="{image.width}"' if image.width else '')
+ + (f' height="{image.height}"' if image.height else '')
+ + ( ' fixedsize="true"' if image.fixedsize else '')) if image else ''
+
+def html_line_breaks(inp):
+ return remove_links(inp).replace('\n', '
') if isinstance(inp, str) else inp
diff --git a/src/wireviz/wv_helper.py b/src/wireviz/wv_helper.py
index 9d785229..ffc4bd84 100644
--- a/src/wireviz/wv_helper.py
+++ b/src/wireviz/wv_helper.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-from wireviz import wv_colors
from typing import List
import re
@@ -32,58 +31,6 @@ def awg_equiv(mm2):
def mm2_equiv(awg):
return mm2_equiv_table.get(str(awg), 'Unknown')
-def nested_html_table(rows):
- # input: list, each item may be scalar or list
- # 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
- # attributes in any leading inside a list are injected into to the preceeding tag
- html = []
- html.append('')
- for row in rows:
- if isinstance(row, List):
- if len(row) > 0 and any(row):
- html.append(' ')
- html.append(' ')
- for cell in row:
- if cell is not None:
- # Inject attributes to the preceeding | tag where needed
- html.append(f' | {cell} | '.replace('>
')
- html.append(' | ')
- elif row is not None:
- html.append(' | ')
- html.append(f' {row}')
- html.append(' | ')
- html.append(' ')
- return html
-
-def html_colorbar(color):
- return f'' if color else None
-
-def html_image(image):
- if not image:
- return None
- # The leading attributes belong to the preceeding tag. See where used below.
- html = f'{html_size_attr(image)}>'
- if image.fixedsize:
- # Close the preceeding tag and enclose the image cell in a table without
- # borders to avoid narrow borders when the fixed width < the node width.
- html = f'''>
-
- '''
- return f'''{html_line_breaks(image.caption)}' if image and image.caption else None
-
-def html_size_attr(image):
- # Return Graphviz HTML attributes to specify minimum or fixed size of a TABLE or TD object
- return ((f' width="{image.width}"' if image.width else '')
- + (f' height="{image.height}"' if image.height else '')
- + ( ' fixedsize="true"' if image.fixedsize else '')) if image else ''
-
def expand(yaml_data):
# yaml_data can be:
@@ -140,19 +87,15 @@ def tuplelist2tsv(inp, header=None):
output = output + '\t'.join(str(remove_links(item)) for item in row) + '\n'
return output
-# Return the value indexed if it is a list, or simply the value otherwise.
-def index_if_list(value, index):
- return value[index] if isinstance(value, list) else value
def remove_links(inp):
return re.sub(r'<[aA] [^>]*>([^<]*)', r'\1', inp) if isinstance(inp, str) else inp
-def html_line_breaks(inp):
- return remove_links(inp).replace('\n', '
') if isinstance(inp, str) else inp
def clean_whitespace(inp):
return ' '.join(inp.split()).replace(' ,', ',') if isinstance(inp, str) else inp
+
def open_file_read(filename):
# TODO: Intelligently determine encoding
return open(filename, 'r', encoding='UTF-8')
@@ -163,7 +106,6 @@ def open_file_write(filename):
def open_file_append(filename):
return open(filename, 'a', encoding='UTF-8')
-
def aspect_ratio(image_src):
try:
from PIL import Image
@@ -175,32 +117,3 @@ def aspect_ratio(image_src):
except Exception as error:
print(f'aspect_ratio(): {type(error).__name__}: {error}')
return 1 # Assume 1:1 when unable to read actual image size
-
-
-def manufacturer_info_field(manufacturer, mpn):
- if manufacturer or mpn:
- return f'{manufacturer if manufacturer else "MPN"}{": " + str(mpn) if mpn else ""}'
- else:
- return None
-
-def component_table_entry(type, qty, unit=None, pn=None, manufacturer=None, mpn=None):
- output = f'{qty}'
- if unit:
- output += f' {unit}'
- output += f' x {type}'
- # print an extra line with part and manufacturer information if provided
- manufacturer_str = manufacturer_info_field(manufacturer, mpn)
- if pn or manufacturer_str:
- output += '
'
- if pn:
- output += f'P/N: {pn}'
- if manufacturer_str:
- output += ', '
- if manufacturer_str:
- output += manufacturer_str
- output = html_line_breaks(output)
- # format the above output as left aligned text in a single visible cell
- # indent is set to two to match the indent in the generated html table
- return f''''''
diff --git a/src/wireviz/wv_html.py b/src/wireviz/wv_html.py
new file mode 100644
index 00000000..b328ba3d
--- /dev/null
+++ b/src/wireviz/wv_html.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from pathlib import Path
+import re
+
+from wireviz import __version__, APP_NAME, APP_URL
+from wireviz.wv_helper import flatten2d, open_file_read, open_file_write
+
+def generate_html_output(filename: (str, Path), bom_list):
+ with open_file_write(f'{filename}.html') as file:
+ file.write('\n')
+ file.write('\n')
+ file.write(' \n')
+ file.write(f' \n')
+ file.write(f' {APP_NAME} Diagram and BOM\n')
+ file.write('\n')
+
+ file.write('Diagram')
+ with open_file_read(f'{filename}.svg') as svg:
+ file.write(re.sub(
+ '^<[?]xml [^?>]*[?]>[^<]*]*>',
+ '',
+ svg.read(1024), 1))
+ for svgdata in svg:
+ file.write(svgdata)
+
+ file.write('Bill of Materials')
+ listy = flatten2d(bom_list)
+ file.write('')
+ file.write('')
+ for item in listy[0]:
+ file.write(f'| {item} | ')
+ file.write(' ')
+ for row in listy[1:]:
+ file.write('')
+ for i, item in enumerate(row):
+ item_str = item.replace('\u00b2', '²')
+ align = 'text-align:right; ' if listy[0][i] == 'Qty' else ''
+ file.write(f'| {item_str} | ')
+ file.write(' ')
+ file.write(' ')
+
+ file.write('')
| |