Skip to content

Some small fixes of mine #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
steelman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Some small fixes of mine #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1850f69
Fix variable names in the @time is assignment
steelman Aug 7, 2013
ae3ce56
Hide assembled parts from the BOM
steelman Aug 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions thingdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class ThingDoc:
elif key == '@weight':
thing.weight = float(value)
elif key == '@time':
thing.weight = float(time)
thing.time = float(value)
elif key.startswith('@'):
self.error('Unknown tag %s (%s:%d)' % (key, absname, linenum))
success = False
Expand Down Expand Up @@ -341,7 +341,9 @@ class ThingDoc:
using = queue.pop(0)
for (id, cnt) in using:
thing = self.tree[id]
if thing.category in bom:
if thing.assembled:
pass
elif thing.category in bom:
if id in bom[thing.category]:
bom[thing.category][id] += cnt
else:
Expand Down