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

Make BOM output optional

Browse Source
This commit is contained in:
Daniel Rojas 2020-06-13 19:50:50 +02:00
parent db313365ee
commit d2abf5f597
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/batch.py
View File

@ -9,12 +9,12 @@ with open(readme, 'w') as file:
for i in range(1,3): for i in range(1,3):
fn = '../examples/demo{:02d}.yml'.format(i) fn = '../examples/demo{:02d}.yml'.format(i)
print(fn) print(fn)
wireviz.parse(fn) wireviz.parse(fn, gen_bom=False)
for i in range(1,7): for i in range(1,7):
fn = '../examples/ex{:02d}.yml'.format(i) fn = '../examples/ex{:02d}.yml'.format(i)
print(fn) print(fn)
wireviz.parse(fn) wireviz.parse(fn, gen_bom=False)
file.write('## Example {:02d}\n'.format(i)) file.write('## Example {:02d}\n'.format(i))
file.write('![](ex{:02d}.png)\n\n'.format(i)) file.write('![](ex{:02d}.png)\n\n'.format(i))

44
src/wireviz.py
View File

@ -245,7 +245,7 @@ class Harness:
return dot return dot
def output(self, filename, directory='_output', view=False, cleanup=True, format='pdf'): def output(self, filename, directory='_output', view=False, cleanup=True, format='pdf', gen_bom=False):
# graphical output # graphical output
d = self.create_graph() d = self.create_graph()
for f in format: for f in format:
@ -253,23 +253,24 @@ class Harness:
d.render(filename=filename, directory=directory, view=view, cleanup=cleanup) d.render(filename=filename, directory=directory, view=view, cleanup=cleanup)
d.save(filename='{}.gv'.format(filename), directory=directory) d.save(filename='{}.gv'.format(filename), directory=directory)
# bom output # bom output
# connectors if gen_bom:
_con = self.bom_connectors() # connectors
header_con = ['Type','Gender','Pin count','Qty','Designators'] _con = self.bom_connectors()
bom_con = tuplelist2tsv(_con, header_con) header_con = ['Type','Gender','Pin count','Qty','Designators']
with open('{}.connectors.bom.tsv'.format(filename),'w') as file: bom_con = tuplelist2tsv(_con, header_con)
file.write(bom_con) with open('{}.connectors.bom.tsv'.format(filename),'w') as file:
# cables file.write(bom_con)
_cbl, _cut = self.bom_cables_and_cutlist() # cables
header_cbl = ['Gauge','Gauge unit','Wire count','Shield','Total length','Designators'] _cbl, _cut = self.bom_cables_and_cutlist()
bom_cbl = tuplelist2tsv(_cbl, header_cbl) header_cbl = ['Gauge','Gauge unit','Wire count','Shield','Total length','Designators']
with open('{}.cables.bom.tsv'.format(filename),'w') as file: bom_cbl = tuplelist2tsv(_cbl, header_cbl)
file.write(bom_cbl) with open('{}.cables.bom.tsv'.format(filename),'w') as file:
# cutlist file.write(bom_cbl)
header_cut = ['Gauge','Gauge unit','Wire count','Shield','Length','Qty','Designators'] # cutlist
bom_cut = tuplelist2tsv(_cut, header_cut) header_cut = ['Gauge','Gauge unit','Wire count','Shield','Length','Qty','Designators']
with open('{}.cutlist.bom.tsv'.format(filename),'w') as file: bom_cut = tuplelist2tsv(_cut, header_cut)
file.write(bom_cut) with open('{}.cutlist.bom.tsv'.format(filename),'w') as file:
file.write(bom_cut)
def bom_connectors(self): def bom_connectors(self):
bom = [] bom = []
@ -499,7 +500,7 @@ def awg_equiv(mm2):
else: else:
return 'unknown' return 'unknown'
def parse(file_in, file_out=None): def parse(file_in, file_out=None, gen_bom=False):
file_in = os.path.abspath(file_in) file_in = os.path.abspath(file_in)
if not file_out: if not file_out:
@ -683,7 +684,7 @@ def parse(file_in, file_out=None):
else: else:
raise Exception('Wrong number of connection parameters') raise Exception('Wrong number of connection parameters')
h.output(filename=file_out, format=('png','svg'), view=False) h.output(filename=file_out, format=('png','svg'), gen_bom=gen_bom, view=False)
def tuplelist2tsv(input, header=None): def tuplelist2tsv(input, header=None):
output = '' output = ''
@ -701,6 +702,7 @@ if __name__ == '__main__':
ap = argparse.ArgumentParser() ap = argparse.ArgumentParser()
ap.add_argument('file_input', nargs='?', default='_test/test.yml') ap.add_argument('file_input', nargs='?', default='_test/test.yml')
ap.add_argument('file_output', nargs='?', default=None) ap.add_argument('file_output', nargs='?', default=None)
ap.add_argument('--bom', action='store_const', default=False, const=True)
args = ap.parse_args() args = ap.parse_args()
parse(args.file_input, args.file_output) parse(args.file_input, file_out=args.file_output, gen_bom=args.bom)