Axes resolution is now independently adjustable for the minimum gcode step

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@941 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Exporters/GCodeExporter.py

@@ -38,7 +38,7 @@ class GCodeGenerator:
 
     def __init__(self, destination, metric_units=True, safety_height=0.0,
             toggle_spindle_status=False, header=None, comment=None,
-            minimum_step=0.0):
+            minimum_step=0.0001,  minimum_step_y=0.0001,  minimum_step_z=0.0001):
         if isinstance(destination, basestring):
             # open the file
             self.destination = file(destination,"w")
@@ -54,8 +54,8 @@ class GCodeGenerator:
         self.toggle_spindle_status = toggle_spindle_status
         self.comment = comment
         self._minimum_step = minimum_step
-        #self._minimum_step_y = minimum_step_y
-        #self._minimum_step_z = minimum_step_z
+        self._minimum_step_y = minimum_step_y
+        self._minimum_step_z = minimum_step_z
         self._finished = False
         if comment:
             self.add_comment(comment)
@@ -108,10 +108,10 @@ class GCodeGenerator:
         # At minimum this will stop the duplicate gcode
         # And this is a place holder for when the GUI is linked
         res_limit_x = self._minimum_step
-        res_limit_y = self._minimum_step
-        res_limit_z = self._minimum_step
-        #res_limit_y = self._minimum_step_y
-        #res_limit_z = self._minimum_step_z
+        #res_limit_y = self._minimum_step
+        #res_limit_z = self._minimum_step
+        res_limit_y = self._minimum_step_y
+        res_limit_z = self._minimum_step_z
         old_position = None
         for pos, rapid in moves:
             new_position = pos

src/pycam/Gui/Project.py

@@ -126,7 +126,9 @@ PREFERENCES_DEFAULTS = {
         "simulation_details_level": 3,
         "drill_progress_max_fps": 2,
         "gcode_safety_height": 25.0,
-        "gcode_minimum_step": 0.0,
+        "gcode_minimum_step": 0.0001,
+        "gcode_minimum_step_y": 0.0001,
+        "gcode_minimum_step_z": 0.0001,
         "gcode_path_mode": 0,
         "gcode_motion_tolerance": 0,
         "gcode_naive_tolerance": 0,
@@ -3769,9 +3771,9 @@ class ProjectGui:
                     safety_height=safety_height,
                     toggle_spindle_status=self.settings.get("gcode_start_stop_spindle"),
                     comment=all_info,
-                    minimum_step=self.settings.get("gcode_minimum_step")) 
-                    #minimum_step_y=self.settings.get("gcode_minimum_step_y"), 
-                    #minimum_step_z=self.settings.get("gcode_minimum_step_z"))
+                    minimum_step=self.settings.get("gcode_minimum_step"),  
+                    minimum_step_y=self.settings.get("gcode_minimum_step_y"),  
+                    minimum_step_z=self.settings.get("gcode_minimum_step_z"))
             path_mode = self.settings.get("gcode_path_mode")
             PATH_MODES = pycam.Exporters.GCodeExporter.PATH_MODES
             if path_mode == 0: