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

Arch: Reintroduced support for custom subvolumes for windows

Browse Source
This commit is contained in:
Yorik van Havre 2015-08-04 22:18:30 -03:00
parent 76c0f55ebe
commit 2bc0826c77
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Arch/ArchComponent.py
View File

@ -754,6 +754,9 @@ class ViewProviderComponent:
if hasattr(self.Object,"Tool"): if hasattr(self.Object,"Tool"):
if self.Object.Tool: if self.Object.Tool:
c.append(self.Object.Tool) c.append(self.Object.Tool)
if hasattr(self.Object,"Subvolume"):
if self.Object.Subvolume:
c.append(self.Object.Subvolume)
return c return c
return [] return []

11
src/Mod/Arch/ArchWindow.py
View File

@ -599,8 +599,7 @@ class _Window(ArchComponent.Component):
ArchComponent.Component.__init__(self,obj) ArchComponent.Component.__init__(self,obj)
obj.addProperty("App::PropertyStringList","WindowParts","Arch",translate("Arch","the components of this window")) obj.addProperty("App::PropertyStringList","WindowParts","Arch",translate("Arch","the components of this window"))
obj.addProperty("App::PropertyLength","HoleDepth","Arch",translate("Arch","The depth of the hole that this window makes in its host object. Keep 0 for automatic.")) obj.addProperty("App::PropertyLength","HoleDepth","Arch",translate("Arch","The depth of the hole that this window makes in its host object. Keep 0 for automatic."))
# the following line creates problem when restoring saved files (wrongly attributes it to the window shape). Disabling for now... obj.addProperty("App::PropertyLink","Subvolume","Arch",translate("Arch","an optional object that defines a volume to be subtracted from hosts of this window"))
#obj.addProperty("Part::PropertyPartShape","Subvolume","Arch",translate("Arch","an optional volume to be subtracted from hosts of this window"))
obj.addProperty("App::PropertyLength","Width","Arch",translate("Arch","The width of this window (for preset windows only)")) obj.addProperty("App::PropertyLength","Width","Arch",translate("Arch","The width of this window (for preset windows only)"))
obj.addProperty("App::PropertyLength","Height","Arch",translate("Arch","The height of this window (for preset windows only)")) obj.addProperty("App::PropertyLength","Height","Arch",translate("Arch","The height of this window (for preset windows only)"))
obj.addProperty("App::PropertyVector","Normal","Arch",translate("Arch","The normal direction of this window")) obj.addProperty("App::PropertyVector","Normal","Arch",translate("Arch","The normal direction of this window"))
@ -707,8 +706,12 @@ class _Window(ArchComponent.Component):
# check if we have a custom subvolume # check if we have a custom subvolume
if hasattr(obj,"Subvolume"): if hasattr(obj,"Subvolume"):
if obj.Subvolume: if obj.Subvolume:
if not obj.Subvolume.isNull(): if obj.Subvolume.isDerivedFrom("Part::Feature"):
return obj.Subvolume if not obj.Subvolume.Shape.isNull():
sh = obj.Subvolume.Shape.copy()
if plac:
sh.Placement = plac
return sh
# getting extrusion depth # getting extrusion depth
base = None base = None