Arch: Merge of PR #2259 - Fix ifc project

src/Mod/Arch/Arch.py

@@ -43,6 +43,7 @@
 from ArchWall import *
 from ArchFloor import *
 from ArchFence import *
+from ArchProject import *
 from ArchSite import *
 from ArchBuilding import *
 from ArchStructure import *

src/Mod/Arch/ArchBuildingPart.py

@@ -313,7 +313,7 @@ def Activated(self):
 
 
 
-class BuildingPart:
+class BuildingPart(ArchIFC.IfcProduct):
 
 
     "The BuildingPart object"
@@ -326,7 +326,7 @@ def __init__(self,obj):
         self.setProperties(obj)
 
     def setProperties(self,obj):
-        ArchIFC.setProperties(obj)
+        ArchIFC.IfcProduct.setProperties(self, obj)
 
         pl = obj.PropertiesList
         if not "Height" in pl:
@@ -366,7 +366,7 @@ def onBeforeChange(self,obj,prop):
 
     def onChanged(self,obj,prop):
 
-        ArchIFC.onChanged(obj, prop)
+        ArchIFC.IfcProduct.onChanged(self, obj, prop)
 
         if prop == "Height":
             for child in obj.Group:

src/Mod/Arch/ArchCommands.py

@@ -116,7 +116,7 @@ def addComponents(objectsList,host):
     if not isinstance(objectsList,list):
         objectsList = [objectsList]
     hostType = Draft.getType(host)
-    if hostType in ["Floor","Building","Site","BuildingPart"]:
+    if hostType in ["Floor","Building","Site","Project","BuildingPart"]:
         for o in objectsList:
             host.addObject(o)
     elif hostType in ["Wall","Structure","Window","Roof","Stairs","StructuralSystem","Panel","Component"]:
@@ -744,7 +744,7 @@ def pruneIncluded(objectslist,strict=False):
         if obj.isDerivedFrom("Part::Feature"):
             if not (Draft.getType(obj) in ["Window","Clone","Pipe","Rebar"]):
                 for parent in obj.InList:
-                    if parent.isDerivedFrom("Part::Feature") and not (Draft.getType(parent) in ["Space","Facebinder","Window","Roof","Clone","Site"]):
+                    if parent.isDerivedFrom("Part::Feature") and not (Draft.getType(parent) in ["Space","Facebinder","Window","Roof","Clone","Site","Project"]):
                         if not parent.isDerivedFrom("Part::Part2DObject"):
                             # don't consider 2D objects based on arch elements
                             if hasattr(parent,"Host") and (parent.Host == obj):

src/Mod/Arch/ArchComponent.py

@@ -133,22 +133,20 @@ def removeFromComponent(compobject,subobject):
 
 
 
-class Component:
-
+class Component(ArchIFC.IfcProduct):
 
     "The default Arch Component object"
 
-    def __init__(self,obj):
-
+    def __init__(self, obj):
         obj.Proxy = self
-        Component.setProperties(self,obj)
+        Component.setProperties(self, obj)
         self.Type = "Component"
 
-    def setProperties(self,obj):
+    def setProperties(self, obj):
 
         "Sets the needed properties of this object"
 
-        ArchIFC.setProperties(obj)
+        ArchIFC.IfcProduct.setProperties(self, obj)
 
         pl = obj.PropertiesList
         if not "Base" in pl:
@@ -195,9 +193,8 @@ def setProperties(self,obj):
         #self.MoveWithHost = False
         self.Type = "Component"
 
-    def onDocumentRestored(self,obj):
-
-        Component.setProperties(self,obj)
+    def onDocumentRestored(self, obj):
+        Component.setProperties(self, obj)
 
     def execute(self,obj):
 
@@ -210,24 +207,20 @@ def execute(self,obj):
             obj.Shape = shape
 
     def __getstate__(self):
-
         # for compatibility with 0.17
         if hasattr(self,"Type"):
             return self.Type
         return "Component"
 
     def __setstate__(self,state):
-
         return None
 
     def onBeforeChange(self,obj,prop):
-
         if prop == "Placement":
             self.oldPlacement = FreeCAD.Placement(obj.Placement)
 
-    def onChanged(self,obj,prop):
-
-        ArchIFC.onChanged(obj, prop)
+    def onChanged(self, obj, prop):
+        ArchIFC.IfcProduct.onChanged(self, obj, prop)
 
         if prop == "Placement":
             if hasattr(self,"oldPlacement"):

src/Mod/Arch/ArchFloor.py

@@ -22,7 +22,7 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,Draft,ArchCommands, DraftVecUtils
+import FreeCAD,Draft,ArchCommands, DraftVecUtils, ArchIFC
 if FreeCAD.GuiUp:
     import FreeCADGui
     from PySide import QtCore, QtGui
@@ -121,7 +121,7 @@ def Activated(self):
             FreeCAD.ActiveDocument.recompute()
 
 
-class _Floor:
+class _Floor(ArchIFC.IfcProduct):
 
     "The Floor object"
 
@@ -134,6 +134,7 @@ def __init__(self,obj):
 
     def setProperties(self,obj):
 
+        ArchIFC.IfcProduct.setProperties(self, obj)
         pl = obj.PropertiesList
         if not "Height" in pl:
             obj.addProperty("App::PropertyLength","Height","Floor",QT_TRANSLATE_NOOP("App::Property","The height of this object"))
@@ -142,10 +143,6 @@ def setProperties(self,obj):
         if not hasattr(obj,"Placement"):
             # obj can be a Part Feature and already has a placement
             obj.addProperty("App::PropertyPlacement","Placement","Base",QT_TRANSLATE_NOOP("App::Property","The placement of this object"))
-        if not "IfcType" in pl:
-            obj.addProperty("App::PropertyEnumeration","IfcType","IFC",QT_TRANSLATE_NOOP("App::Property","The type of this object"))
-            import ArchIFC
-            obj.IfcType = ArchIFC.IfcTypes
         self.Type = "Floor"
 
     def onDocumentRestored(self,obj):
@@ -161,6 +158,7 @@ def __setstate__(self,state):
         return None
 
     def onChanged(self,obj,prop):
+        ArchIFC.IfcProduct.onChanged(self, obj, prop)
 
         if not hasattr(self,"Object"):
             # on restore, self.Object is not there anymore