Arch: Fixed remaining bugs in Schedule - Fixes #3590

This commit is contained in:
Yorik van Havre
2018-12-17 12:24:27 -02:00
parent 8894c97744
commit 17849c656e

View File

@@ -127,7 +127,7 @@ class _ArchSchedule:
if objs:
objs = objs.split(";")
objs = [FreeCAD.ActiveDocument.getObject(o) for o in objs]
objs = [obj for obj in objs if obj != None]
objs = [o for o in objs if o != None]
else:
objs = FreeCAD.ActiveDocument.Objects
if len(objs) == 1:
@@ -136,6 +136,9 @@ class _ArchSchedule:
objs = objs[0].Group
objs = Draft.getGroupContents(objs,walls=True,addgroups=True)
objs = Arch.pruneIncluded(objs,strict=True)
# remove the schedule object and its result from the list
objs = [o for o in objs if not o == obj]
objs = [o for o in objs if not o == obj.Result]
if obj.Filter[i]:
# apply filters
nobjs = []
@@ -231,6 +234,7 @@ class _ArchSchedule:
obj.Result.set("B"+str(i+2),str(val))
if verbose:
print ("TOTAL:"+34*" "+str(val))
obj.Result.recompute()
def __getstate__(self):
return self.Type