PathHelix: Add simple x,y path sorting

Same PathUtils.sort_jobs() method copied from PathDrilling Change feedback comment to debug category
FreeCAD · Jul 12, 2019 · ea5a139 · ea5a139
1 parent ec00499
commit ea5a139
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Mod/Path/PathScripts/PathCircularHoleBase.py b/src/Mod/Path/PathScripts/PathCircularHoleBase.py
@@ -51,7 +51,7 @@
 __contributors__ = "russ4262 (Russell Johnson)"
 __created__ = "2017"
 __scriptVersion__ = "1d testing"
-__lastModified__ = "2019-07-09 22:59 CST"
+__lastModified__ = "2019-07-12 09:58 CST"
 
 
 # Qt translation handling
@@ -323,7 +323,7 @@ def haveLocations(self, obj):
 
                         # If user has not adjusted Final Depth value, attempt to determine from sub
                         if obj.OpFinalDepth.Value == obj.FinalDepth.Value:
-                            PathLog.info(translate('Path', 'Auto detecting Final Depth based on {}.'.format(sub)))
+                            PathLog.debug(translate('Path', 'Auto detecting Final Depth based on {}.'.format(sub)))
                             trgtDep = finDep
                         else:
                             trgtDep = max(obj.FinalDepth.Value, finDep)

diff --git a/src/Mod/Path/PathScripts/PathHelix.py b/src/Mod/Path/PathScripts/PathHelix.py
@@ -31,6 +31,7 @@
 
 from PathScripts.PathUtils import fmt
 from PathScripts.PathUtils import findParentJob
+from PathScripts.PathUtils import sort_jobs
 from PySide import QtCore
 
 __title__ = "Path Helix Drill Operation"
@@ -39,8 +40,8 @@
 __doc__ = "Class and implementation of Helix Drill operation"
 __contributors__ = "russ4262 (Russell Johnson)"
 __created__ = "2016"
-__scriptVersion__ = "1a testing"
-__lastModified__ = "2019-07-03 11:45 CST"
+__scriptVersion__ = "1b testing"
+__lastModified__ = "2019-07-12 09:50 CST"
 
 
 def translate(context, text, disambig=None):
@@ -81,6 +82,7 @@ def circularHoleExecute(self, obj, holes):
         output = ''
         output += "G0 Z" + fmt(zsafe)
 
+        holes = sort_jobs(holes, ['x', 'y'])
         for hole in holes:
             output += self.helix_cut(obj, hole['x'], hole['y'], hole['r'] / 2, float(obj.StartRadius.Value), (float(obj.StepOver.Value) / 50.0) * self.radius)
         PathLog.debug(output)