Arch: small bugfixes and optimisations

FreeCAD · Aug 3, 2014 · c7bfaf2 · c7bfaf2
1 parent b32b227
commit c7bfaf2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 32 deletions.
diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
@@ -335,12 +335,13 @@ def getAxis(self,obj):
                         if not obj.Base.Shape.Wires[0].isClosed():
                             return obj.Base.Shape.copy()
                     elif not(obj.Base.Shape.Solids):
-                        p1 = obj.Base.Shape.CenterOfMass
-                        v = self.getExtrusionVector(obj)
-                        if v:
-                            p2 = p1.add(v)
-                            import Part
-                            return Part.Line(p1,p2).toShape()
+                        if hasattr(obj.Base.Shape,"CenterOfMass"):
+                            p1 = obj.Base.Shape.CenterOfMass
+                            v = self.getExtrusionVector(obj)
+                            if v:
+                                p2 = p1.add(v)
+                                import Part
+                                return Part.Line(p1,p2).toShape()
         else:
             p1 = FreeCAD.Vector()
             v = self.getExtrusionVector(obj)

diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py
@@ -144,6 +144,7 @@ def getShape(self,obj):
             if obj.Base.isDerivedFrom("Part::Feature"):
                 if obj.Base.Shape.Solids:
                     shape = obj.Base.Shape.Solids[0].copy()
+                    shape = shape.removeSplitter()
 
         # 2: if not, add all bounding boxes of considered objects and build a first shape
         if shape:

diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py
@@ -682,9 +682,7 @@ def execute(self,obj):
                         print "Arch: Bad formatting of window parts definitions"
 
         base = self.processSubShapes(obj,base)
-        if base:
-            if not base.isNull():
-                obj.Shape = base
+        self.applyShape(obj,base,pl)
 
     def getSubVolume(self,obj,plac=None):
         "returns a subvolume for cutting in a base object"

diff --git a/src/Mod/Arch/Arch_rc.py b/src/Mod/Arch/Arch_rc.py
diff --git a/src/Mod/Arch/Resources/ui/archprefs-import.ui b/src/Mod/Arch/Resources/ui/archprefs-import.ui
@@ -161,26 +161,6 @@
       <string>IFC export</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_3">
-          <property name="toolTip">
-           <string>If this is checked, a text file will be exported together with the ifc file, containing the list of exported objects, for verification purposes.</string>
-          </property>
-          <property name="text">
-           <string>Save a list of exported objects</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>IfcExportList</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Arch</cstring>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_6">
         <item>