Merge remote-tracking branch 'jonnor/path-cli-fixes'

src/Mod/Draft/DraftGeomUtils.py

@@ -2318,17 +2318,17 @@ def circleFrom2PointsRadius(p1, p2, radius):
     dist_p1p2 = DraftVecUtils.dist(p1, p1)
     mid = findMidpoint(p1_p2)
     if dist_p1p2 == 2*radius:
-        circle = Part.Circle(mid, norm, radius)
+        circle = Part.Circle(mid, NORM, radius)
         if circle: return [circle]
         else: return None
     dir = vec(p1_p2); dir.normalize()
-    perpDir = dir.cross(Vector(0,0,1)); perpDir.normailze()
+    perpDir = dir.cross(Vector(0,0,1)); perpDir.normalize()
     dist = math.sqrt(radius**2 - (dist_p1p2 / 2.0)**2)
     cen1 = Vector.add(mid, Vector(perpDir).multiply(dist))
     cen2 = Vector.add(mid, Vector(perpDir).multiply(-dist))
     circles = []
-    if cen1: circles.append(Part.Circle(cen1, norm, radius))
-    if cen2: circles.append(Part.Circle(cen2, norm, radius))
+    if cen1: circles.append(Part.Circle(cen1, NORM, radius))
+    if cen2: circles.append(Part.Circle(cen2, NORM, radius))
     if circles: return circles
     else: return None
 

src/Mod/Path/PathScripts/PathDrilling.py

@@ -22,10 +22,14 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Path,PathGui
+import FreeCAD,Path
 from PySide import QtCore,QtGui
 from PathScripts import PathUtils,PathSelection,PathProject
 
+FreeCADGui = None
+if FreeCAD.GuiUp:
+    import FreeCADGui
+
 """Path Drilling object and FreeCAD command"""
 
 # Qt tanslation handling

src/Mod/Path/PathScripts/PathMachine.py

@@ -23,11 +23,11 @@
 #***************************************************************************
 ''' A CNC machine object to define how code is posted '''
 
-import FreeCAD,FreeCADGui,Path,PathGui
+import FreeCAD,Path
 import PathScripts
 from PathScripts import PathProject, PathUtils
 from PySide import QtCore,QtGui
-import os, sys
+import os, sys    
 
 # Qt tanslation handling
 try:
@@ -228,6 +228,7 @@ class CommandPathMachine:
 
 if FreeCAD.GuiUp: 
     # register the FreeCAD command
+    import FreeCADGui
     FreeCADGui.addCommand('Path_Machine',CommandPathMachine())
 
 

src/Mod/Path/PathScripts/PathPocket.py

@@ -22,10 +22,14 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Path,PathGui
+import FreeCAD,Path
 from PySide import QtCore,QtGui
 from PathScripts import PathUtils
 
+FreeCADGui = None
+if FreeCAD.GuiUp:
+    import FreeCADGui
+
 """Path Pocket object and FreeCAD command"""
 
 # Qt tanslation handling

src/Mod/Path/PathScripts/PathProject.py

@@ -22,9 +22,13 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Path,PathGui
+import FreeCAD,Path
 from PySide import QtCore,QtGui
 
+FreeCADGui = None
+if FreeCAD.GuiUp:
+    import FreeCADGui
+
 """Path Project object and FreeCAD command"""
 
 # Qt tanslation handling

src/Mod/Path/PathScripts/PostUtils.py

@@ -27,9 +27,12 @@ These are a common functions and classes for creating custom post processors.
 '''
 
 from PySide import QtCore, QtGui
-import FreeCADGui
 import FreeCAD
 
+FreeCADGui = None
+if FreeCAD.GuiUp:
+    import FreeCADGui
+
 class OldHighlighter(QtGui.QSyntaxHighlighter):
     def highlightBlock(self, text):
         myClassFormat = QtGui.QTextCharFormat()
@@ -76,7 +79,9 @@ class GCodeHighlighter(QtGui.QSyntaxHighlighter):
 
 
 class GCodeEditorDialog(QtGui.QDialog):
-    def __init__(self, parent = FreeCADGui.getMainWindow()):
+    def __init__(self, parent = None):
+        if parent is None:
+            parent = FreeCADGui.getMainWindow()
         QtGui.QDialog.__init__(self,parent)
 
         layout = QtGui.QVBoxLayout(self)