suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arch: Fixed misc bugs in schedule

Browse Source
This commit is contained in:
Yorik van Havre 2016-10-14 17:16:58 -03:00
parent ccbd0f02af
commit c3a6ac7a7d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Arch/ArchCommands.py
View File

@ -670,7 +670,7 @@ def pruneIncluded(objectslist):
for obj in objectslist: for obj in objectslist:
toplevel = True toplevel = True
if obj.isDerivedFrom("Part::Feature"): if obj.isDerivedFrom("Part::Feature"):
if not (Draft.getType(obj) in ["Window","Clone"]): if not (Draft.getType(obj) in ["Window","Clone","Pipe"]):
for parent in obj.InList: for parent in obj.InList:
if parent.isDerivedFrom("Part::Feature"): if parent.isDerivedFrom("Part::Feature"):
if not parent.isDerivedFrom("Part::Part2DObject"): if not parent.isDerivedFrom("Part::Part2DObject"):

6
src/Mod/Arch/ArchPipe.py
View File

@ -205,7 +205,9 @@ class _ArchPipe(ArchComponent.Component):
FreeCAD.Console.PrintError(translate("Arch","Unable to build the pipe\n")) FreeCAD.Console.PrintError(translate("Arch","Unable to build the pipe\n"))
else: else:
obj.Shape = sh obj.Shape = sh
if not obj.Base: if obj.Base:
obj.Length = w.Length
else:
obj.Placement = pl obj.Placement = pl
def getWire(self,obj): def getWire(self,obj):
@ -421,5 +423,7 @@ if FreeCAD.GuiUp:
return { 'MenuText': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe tools'), return { 'MenuText': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe tools'),
'ToolTip': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe tools') 'ToolTip': QT_TRANSLATE_NOOP("Arch_PipeTools",'Pipe tools')
} }
def IsActive(self):
return not FreeCAD.ActiveDocument is None
FreeCADGui.addCommand('Arch_PipeTools', _ArchPipeGroupCommand()) FreeCADGui.addCommand('Arch_PipeTools', _ArchPipeGroupCommand())

4
src/Mod/Arch/ArchSchedule.py
View File

@ -166,7 +166,7 @@ class _ArchSchedule:
obj.Result.set("B"+str(i+2),str(val)) obj.Result.set("B"+str(i+2),str(val))
else: else:
vals = val.split(".") vals = val.split(".")
sumval = None sumval = 0
for o in objs: for o in objs:
if verbose: if verbose:
l = o.Name+" ("+o.Label+"):" l = o.Name+" ("+o.Label+"):"
@ -177,6 +177,8 @@ class _ArchSchedule:
d = getattr(d,v) d = getattr(d,v)
if verbose: if verbose:
print d print d
if hasattr(d,"Value"):
d = d.Value
except: except:
FreeCAD.Console.PrintWarning(translate("Arch","Unable to retrieve value from object")+": "+o.Name+"."+".".join(vals)+"\n") FreeCAD.Console.PrintWarning(translate("Arch","Unable to retrieve value from object")+": "+o.Name+"."+".".join(vals)+"\n")
else: else: