Commit 7b34cbe7 authored by paulusmax's avatar paulusmax

An attempt to get the resolution for each axis to be controlled individually. ...

An attempt to get the resolution for each axis to be controlled individually.  However not implemented properly yet so all axes still key off the x-axis resolution.

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@940 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent d4761685
This diff is collapsed.
...@@ -54,6 +54,8 @@ class GCodeGenerator: ...@@ -54,6 +54,8 @@ class GCodeGenerator:
self.toggle_spindle_status = toggle_spindle_status self.toggle_spindle_status = toggle_spindle_status
self.comment = comment self.comment = comment
self._minimum_step = minimum_step self._minimum_step = minimum_step
#self._minimum_step_y = minimum_step_y
#self._minimum_step_z = minimum_step_z
self._finished = False self._finished = False
if comment: if comment:
self.add_comment(comment) self.add_comment(comment)
...@@ -108,6 +110,8 @@ class GCodeGenerator: ...@@ -108,6 +110,8 @@ class GCodeGenerator:
res_limit_x = self._minimum_step res_limit_x = self._minimum_step
res_limit_y = self._minimum_step res_limit_y = self._minimum_step
res_limit_z = 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 old_position = None
for pos, rapid in moves: for pos, rapid in moves:
new_position = pos new_position = pos
......
...@@ -883,9 +883,15 @@ class ProjectGui: ...@@ -883,9 +883,15 @@ class ProjectGui:
self._task_property_signals.append((obj, self._task_property_signals.append((obj,
obj.connect("changed", self._handle_task_setting_change))) obj.connect("changed", self._handle_task_setting_change)))
# gcode settings # gcode settings
gcode_minimum_step = self.gui.get_object("GCodeMinimumStep") gcode_minimum_step = self.gui.get_object("GCodeMinimumStep_x")
self.settings.add_item("gcode_minimum_step", self.settings.add_item("gcode_minimum_step",
gcode_minimum_step.get_value, gcode_minimum_step.set_value) gcode_minimum_step.get_value, gcode_minimum_step.set_value)
gcode_minimum_step_y = self.gui.get_object("GCodeMinimumStep_y")
self.settings.add_item("gcode_minimum_step_y",
gcode_minimum_step_y.get_value, gcode_minimum_step_y.set_value)
gcode_minimum_step_z = self.gui.get_object("GCodeMinimumStep_z")
self.settings.add_item("gcode_minimum_step_z",
gcode_minimum_step_z.get_value, gcode_minimum_step_z.set_value)
gcode_safety_height = self.gui.get_object("SafetyHeightControl") gcode_safety_height = self.gui.get_object("SafetyHeightControl")
self.settings.add_item("gcode_safety_height", self.settings.add_item("gcode_safety_height",
gcode_safety_height.get_value, gcode_safety_height.set_value) gcode_safety_height.get_value, gcode_safety_height.set_value)
...@@ -3764,6 +3770,8 @@ class ProjectGui: ...@@ -3764,6 +3770,8 @@ class ProjectGui:
toggle_spindle_status=self.settings.get("gcode_start_stop_spindle"), toggle_spindle_status=self.settings.get("gcode_start_stop_spindle"),
comment=all_info, comment=all_info,
minimum_step=self.settings.get("gcode_minimum_step")) 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_mode = self.settings.get("gcode_path_mode")
PATH_MODES = pycam.Exporters.GCodeExporter.PATH_MODES PATH_MODES = pycam.Exporters.GCodeExporter.PATH_MODES
if path_mode == 0: if path_mode == 0:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment