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

Arch: added pref setting to disable aggregation of windows into their host walls

Browse Source
This commit is contained in:
Yorik van Havre 2014-04-24 20:44:59 -03:00
parent 79efe68e25
commit 8ff9fb9db9
4 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,7 +694,7 @@ def getHost(obj,strict=True):
import Draft
t = Draft.getType(obj)
for par in obj.InList:
if par.isDerivedFrom("Part::Feature"):
if par.isDerivedFrom("Part::Feature") or par.isDerivedFrom("App::DocumentObjectGroup"):
if strict:
if Draft.getType(par) != t:
return par

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

File diff suppressed because one or more lines are too long

17
src/Mod/Arch/Resources/ui/archprefs-import.ui
View File

@ -299,6 +299,23 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_14">
<item>
<widget class="Gui::PrefCheckBox" name="checkBox_4">
<property name="text">
<string>Aggregate windows to their host objects</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ifcAggregateWindows</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Arch</cstring>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>

28
src/Mod/Arch/importIFC.py
View File

@ -63,7 +63,7 @@ def insert(filename,docname,skip=None):
def getConfig():
"Gets Arch IFC import preferences"
global CREATE_IFC_GROUPS, ASMESH, PREFIX_NUMBERS, FORCE_PYTHON_PARSER, SEPARATE_OPENINGS, SEPARATE_PLACEMENTS, JOINSOLIDS
global CREATE_IFC_GROUPS, ASMESH, PREFIX_NUMBERS, FORCE_PYTHON_PARSER, SEPARATE_OPENINGS, SEPARATE_PLACEMENTS, JOINSOLIDS, AGGREGATE_WINDOWS
CREATE_IFC_GROUPS = False
IMPORT_IFC_FURNITURE = False
ASMESH = ["IfcFurnishingElement"]
@ -78,6 +78,7 @@ def getConfig():
SEPARATE_PLACEMENTS = p.GetBool("ifcSeparatePlacements",False)
PREFIX_NUMBERS = p.GetBool("ifcPrefixNumbers",False)
JOINSOLIDS = p.GetBool("ifcJoinSolids",False)
AGGREGATE_WINDOWS = p.GetBool("ifcAggregateWindows",False)
skiplist = p.GetString("ifcSkip","")
if skiplist:
SKIP = skiplist.split(",")
@ -1092,17 +1093,26 @@ def export(exportList,filename):
ifc.addStructure( role, [ifc.addFacetedBrep(f) for f in fdata], storey=parent, name=name )
elif otype == "Window":
if parent:
p = ifc.findByName("IfcWallStandardCase",str(parent.Label))
if not p:
p = ifc.findByName("IfcWall",str(parent.Label))
if AGGREGATE_WINDOWS:
if parent:
p = ifc.findByName("IfcWallStandardCase",str(parent.Label))
if not p:
p = ifc.findByName("IfcColumn",str(parent.Label))
p = ifc.findByName("IfcWall",str(parent.Label))
if not p:
p = ifc.findByName("IfcBeam",str(parent.Label))
p = ifc.findByName("IfcColumn",str(parent.Label))
if not p:
p = ifc.findByName("IfcSlab",str(parent.Label))
parent = p
p = ifc.findByName("IfcBeam",str(parent.Label))
if not p:
p = ifc.findByName("IfcSlab",str(parent.Label))
parent = p
else:
if parent:
p = Arch.getHost(parent)
if p:
parent = ifc.findByName("IfcBuildingStorey",str(p.Label))
else:
parent = None
role = "IfcWindow"
if hasattr(obj,"Role"):
if obj.Role == "Door":