diff --git a/src/wireviz.py b/src/wireviz.py index bf76246..19a9561 100755 --- a/src/wireviz.py +++ b/src/wireviz.py @@ -120,7 +120,7 @@ class Harness: html = '
' # main table html = html + '' # name+attributes table - if (not c.show_name) or c.category != 'bundle': + if c.show_name: html = html + ''.format(colspan=len(a), name=c.name) html = html + '' # attribute row for attrib in a: @@ -204,6 +204,30 @@ class Harness: bom_list = self.bom_list() with open('{}.bom.tsv'.format(filename),'w') as file: file.write(tuplelist2tsv(bom_list)) + # HTML output + with open('{}.html'.format(filename),'w') as file: + file.write('') + + file.write('

Diagram

') + with open('{}.svg'.format(filename),'r') as svg: + for l in svg: + file.write(l) + + file.write('

Bill of Materials

') + listy = flatten2d(bom_list) + file.write('
{name}
') + file.write('') + for item in listy[0]: + file.write(''.format(item)) + file.write('') + for row in listy[1:]: + file.write('') + for i, item in enumerate(row): + file.write(''.format(content=item, align='align="right"' if listy[0][i] == 'Qty' else '')) + file.write('') + file.write('
{}
{content}
') + + file.write('') def bom(self): bom = []