From 1850f6923f09c303fa90f5f3e2ec04398e045ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= Date: Wed, 7 Aug 2013 21:55:03 +0200 Subject: [PATCH 1/2] Fix variable names in the @time is assignment --- thingdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thingdoc b/thingdoc index eb194ff..023d63c 100755 --- a/thingdoc +++ b/thingdoc @@ -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 From ae3ce5691b4fdbc04caf98c4b077b5ff6bc3938d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= Date: Thu, 8 Aug 2013 00:10:34 +0200 Subject: [PATCH 2/2] Hide assembled parts from the BOM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz Stelmach --- thingdoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/thingdoc b/thingdoc index 023d63c..141af39 100755 --- a/thingdoc +++ b/thingdoc @@ -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: