Dressup gui import cleanup

FreeCAD · Jun 2, 2019 · 285efa3 · 285efa3
1 parent 71a3690
commit 285efa3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/Mod/Path/PathScripts/PathDressupAxisMap.py b/src/Mod/Path/PathScripts/PathDressupAxisMap.py
@@ -22,13 +22,16 @@
 # *                                                                         *
 # ***************************************************************************
 import FreeCAD
-import FreeCADGui
 import Path
 import math
 import PathScripts.PathGeom as PathGeom
 import PathScripts.PathUtils as PathUtils
 
-from PySide import QtCore, QtGui
+from PySide import QtCore
+
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui
 
 """Axis remapping Dressup object and FreeCAD command.  This dressup remaps one axis of motion to another.
 For example, you can re-map the Y axis to A to control a 4th axis rotary."""

diff --git a/src/Mod/Path/PathScripts/PathDressupDogbone.py b/src/Mod/Path/PathScripts/PathDressupDogbone.py
@@ -24,7 +24,6 @@
 from __future__ import print_function
 import DraftGeomUtils
 import FreeCAD
-import FreeCADGui
 import math
 import Part
 import Path
@@ -34,7 +33,7 @@
 import PathScripts.PathUtil as PathUtil
 import PathScripts.PathUtils as PathUtils
 
-from PySide import QtCore, QtGui
+from PySide import QtCore
 
 """Dogbone Dressup object and FreeCAD command"""
 
@@ -1076,7 +1075,8 @@ def Activated(self):
         FreeCAD.ActiveDocument.recompute()
 
 if FreeCAD.GuiUp:
-    # register the FreeCAD command
+    import FreeCADGui
+    from PySide import QtGui
     FreeCADGui.addCommand('Path_DressupDogbone', CommandDressupDogbone())
 
 FreeCAD.Console.PrintLog("Loading DressupDogbone... done\n")
diff --git a/src/Mod/Path/PathScripts/PathDressupDragknife.py b/src/Mod/Path/PathScripts/PathDressupDragknife.py
@@ -24,7 +24,6 @@
 
 from __future__ import print_function
 import FreeCAD
-import FreeCADGui
 import Path
 from PySide import QtCore
 import math
@@ -33,6 +32,9 @@
 
 """Dragknife Dressup object and FreeCAD command"""
 
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui
 
 # Qt translation handling
 def translate(context, text, disambig=None):

diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
@@ -25,7 +25,6 @@
 from __future__ import print_function
 
 import FreeCAD
-import FreeCADGui
 import Path
 import PathScripts.PathDressup as PathDressup
 import PathScripts.PathGeom as PathGeom
@@ -37,6 +36,9 @@
 
 """LeadInOut Dressup MASHIN-CRC USE ROLL-ON ROLL-OFF to profile"""
 
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui
 
 # Qt translation handling
 def translate(text, context="Path_DressupLeadInOut", disambig=None):

diff --git a/src/Mod/Path/PathScripts/PathDressupRampEntry.py b/src/Mod/Path/PathScripts/PathDressupRampEntry.py
@@ -22,7 +22,6 @@
 # *                                                                         *
 # ***************************************************************************
 import FreeCAD
-import FreeCADGui
 import Path
 import Part
 import PathScripts.PathDressup as PathDressup
@@ -33,6 +32,10 @@
 from PathScripts import PathUtils
 from PySide import QtCore
 
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui
+
 
 # Qt translation handling
 def translate(text, context="Path_DressupRampEntry", disambig=None):

diff --git a/src/Mod/Path/PathTests/TestPathGeom.py b/src/Mod/Path/PathTests/TestPathGeom.py
@@ -31,7 +31,6 @@
 import unittest
 
 from FreeCAD import Vector
-#from PathScripts.PathDressupHoldingTags import *
 from PathTests.PathTestUtils import PathTestBase
 
 class TestPathGeom(PathTestBase):