Merge branch 'main' into bim-cleanup-license

src/Mod/BIM/ArchSchedule.py

@@ -24,21 +24,9 @@
 # *                                                                         *
 # ***************************************************************************
 
-import FreeCAD
-from draftutils import params
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore, QtGui
-    from draftutils.translate import translate
-    from PySide.QtCore import QT_TRANSLATE_NOOP
-else:
-    # \cond
-    def translate(ctxt,txt):
-        return txt
-    def QT_TRANSLATE_NOOP(ctxt,txt):
-        return txt
-    # \endcond
+__title__ = "Arch Schedule"
+__author__ = "Yorik van Havre"
+__url__ = "https://www.freecad.org"
 
 ## @package ArchSchedule
 #  \ingroup ARCH
@@ -48,16 +36,28 @@ else:
 #  Schedules are objects that can count and gather information
 #  about objects in the document, and fill a spreadsheet with the result
 
-__title__ = "Arch Schedule"
-__author__ = "Yorik van Havre"
-__url__ = "https://www.freecad.org"
+import FreeCAD
+
+from draftutils import params
+
+if FreeCAD.GuiUp:
+    from PySide import QtCore, QtGui
+    from PySide.QtCore import QT_TRANSLATE_NOOP
+    import FreeCADGui
+    from draftutils.translate import translate
+else:
+    # \cond
+    def translate(ctxt,txt):
+        return txt
+    def QT_TRANSLATE_NOOP(ctxt,txt):
+        return txt
+    # \endcond
 
 
 PARAMS = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/BIM")
 VERBOSE = True # change this for silent recomputes
 
 
-
 class _ArchScheduleDocObserver:
 
     "doc observer to monitor all recomputes"
@@ -258,7 +258,8 @@ class _ArchSchedule:
             ifcfile = None
             elts = None
             if val:
-                import Draft,Arch
+                import Draft
+                import Arch
                 if objs:
                     objs = objs.split(";")
                     objs = [FreeCAD.ActiveDocument.getObject(o) for o in objs]