Merge branch 'main' into bim-cleanup-license

src/Mod/BIM/ArchStructure.py

@@ -24,26 +24,9 @@
 
 #Modified 2016-01-03 JAndersM
 
-import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
-from FreeCAD import Vector
-import ArchProfile
-from draftutils import params
-from draftutils import gui_utils
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore, QtGui
-    from draftutils.translate import translate
-    from PySide.QtCore import QT_TRANSLATE_NOOP
-    import ArchPrecast
-    import draftguitools.gui_trackers as DraftTrackers
-else:
-    # \cond
-    def translate(ctxt,txt):
-        return txt
-    def QT_TRANSLATE_NOOP(ctxt,txt):
-        return txt
-    # \endcond
+__title__= "FreeCAD Structure"
+__author__ = "Yorik van Havre"
+__url__ = "https://www.freecad.org"
 
 ## @package ArchStructure
 #  \ingroup ARCH
@@ -54,9 +37,31 @@ else:
 #  elements that have a structural function, that is, that
 #  support other parts of the building.
 
-__title__= "FreeCAD Structure"
-__author__ = "Yorik van Havre"
-__url__ = "https://www.freecad.org"
+import FreeCAD
+import ArchComponent
+import ArchCommands
+import ArchProfile
+import Draft
+import DraftVecUtils
+
+from FreeCAD import Vector
+from draftutils import params
+from draftutils import gui_utils
+
+if FreeCAD.GuiUp:
+    from PySide import QtCore, QtGui
+    from PySide.QtCore import QT_TRANSLATE_NOOP
+    import FreeCADGui
+    import ArchPrecast
+    import draftguitools.gui_trackers as DraftTrackers
+    from draftutils.translate import translate
+else:
+    # \cond
+    def translate(ctxt,txt):
+        return txt
+    def QT_TRANSLATE_NOOP(ctxt,txt):
+        return txt
+    # \endcond
 
 
 #Reads preset profiles and categorizes them
@@ -790,7 +795,8 @@ class _Structure(ArchComponent.Component):
 
         "creates the structure shape"
 
-        import Part, DraftGeomUtils
+        import Part
+        import DraftGeomUtils
 
         if self.clone(obj):
             return
@@ -909,7 +915,8 @@ class _Structure(ArchComponent.Component):
             IfcType = obj.IfcType
         else:
             IfcType = None
-        import Part,DraftGeomUtils
+        import Part
+        import DraftGeomUtils
         data = ArchComponent.Component.getExtrusionData(self,obj)
         if data:
             if not isinstance(data[0],list):
@@ -1548,7 +1555,8 @@ class _StructuralSystem(ArchComponent.Component): # OBSOLETE - All Arch objects
     def execute(self,obj):
         "creates the structure shape"
 
-        import Part, DraftGeomUtils
+        import Part
+        import DraftGeomUtils
 
         # creating base shape
         pl = obj.Placement