Skip to content

P
pyMKcam
Commit 14811aea authored by paulusmax's avatar paulusmax
Browse files
Options

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.  Now all axes properly named and working just fine...  changed the default to 0.0001 for now untill gcode resolution selection is available.

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@946 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent e69391f9
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 68 deletions
pycam
View file @ 14811aea
......@@ -378,7 +378,9 @@ def execute(parser, opts, args, pycam):
handler, metric_units = (opts.unit_size == "mm"),
safety_height=opts.safety_height,
toggle_spindle_status=opts.gcode_no_start_stop_spindle,
minimum_step=opts.gcode_minimum_step)
minimum_step_x=opts.gcode_minimum_step_x,
minimum_step_y=opts.gcode_minimum_step_y,
minimum_step_z=opts.gcode_minimum_step_z)
generator.set_speed(opts.tool_feedrate, opts.tool_spindle_speed)
path_mode = opts.gcode_path_mode
PATH_MODES = pycam.Exporters.GCodeExporter.PATH_MODES
......@@ -616,7 +618,7 @@ if __name__ == "__main__":
action="store_false", help="do not start the spindle before " \
+ "and stop it after each operation (M3/M5)")
group_gcode.add_option("", "--gcode-minimum-step",
dest="gcode_minimum_step", default=0.0,
dest="gcode_minimum_step_x", default=0.0,
type="float", action="store", help="mimimum axial distance " \
+ "between two machine positions. Any shorter move is not " \
+ "written to GCode (default: 0.0).")
......
share/ui/pycam-project.ui
View file @ 14811aea
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy project-wide -->
......@@ -619,7 +619,7 @@
<object class="GtkSpinButton" id="ScalePercent">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="activates_default">True</property>
<property name="adjustment">scale_percent_value</property>
</object>
......@@ -691,7 +691,7 @@
<object class="GtkSpinButton" id="ScaleDimensionControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="activates_default">True</property>
<property name="adjustment">ScaleDimensionValue</property>
<property name="digits">2</property>
......@@ -785,7 +785,7 @@
<object class="GtkSpinButton" id="shift_x">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="activates_default">True</property>
<property name="width_chars">5</property>
<property name="adjustment">shift-x</property>
......@@ -801,7 +801,7 @@
<object class="GtkSpinButton" id="shift_y">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="activates_default">True</property>
<property name="width_chars">5</property>
<property name="adjustment">shift-y</property>
......@@ -819,7 +819,7 @@
<object class="GtkSpinButton" id="shift_z">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="activates_default">True</property>
<property name="width_chars">5</property>
<property name="adjustment">shift-z</property>
......@@ -1101,7 +1101,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridThicknessControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridThickness</property>
<property name="digits">2</property>
</object>
......@@ -1134,7 +1134,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridHeightControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridHeight</property>
<property name="digits">2</property>
</object>
......@@ -1200,7 +1200,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridDistanceXControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridDistanceX</property>
<property name="digits">2</property>
</object>
......@@ -1215,7 +1215,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridDistanceYControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridDistanceY</property>
<property name="digits">2</property>
</object>
......@@ -1323,7 +1323,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridOffsetXControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridOffsetX</property>
<property name="digits">2</property>
</object>
......@@ -1356,7 +1356,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridOffsetYControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridOffsetY</property>
<property name="digits">2</property>
</object>
......@@ -1491,7 +1491,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SupportGridPositionManualShiftControl2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridPositionManualAdjustment</property>
<property name="digits">1</property>
</object>
......@@ -1573,7 +1573,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="GridMinBridgesPerPolygon">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridMinBridgesPerPolygon</property>
</object>
<packing>
......@@ -1604,7 +1604,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="GridAverageDistance">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridAverageDistance</property>
<property name="digits">2</property>
</object>
......@@ -1688,7 +1688,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="GridLengthControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SupportGridLength</property>
<property name="digits">2</property>
</object>
......@@ -1914,7 +1914,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkEntry" id="ToolName">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="width_chars">30</property>
</object>
<packing>
......@@ -2072,7 +2072,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="ToolDiameterControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="adjustment">tooldiameter</property>
<property name="digits">4</property>
</object>
......@@ -2087,7 +2087,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="TorusDiameterControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="adjustment">torusdiameter</property>
<property name="digits">4</property>
</object>
......@@ -2176,7 +2176,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="FeedrateControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="adjustment">feedrate</property>
</object>
<packing>
......@@ -2190,7 +2190,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkSpinButton" id="SpindleSpeedControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="adjustment">speed</property>
</object>
<packing>
......@@ -2430,7 +2430,7 @@ The projection plane is usually at z=0. Only in case of models completely above
<object class="GtkEntry" id="ProcessSettingName">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="width_chars">30</property>
</object>
<packing>
......@@ -2607,7 +2607,7 @@ Use the "Engrave Offset" to shift the position of the tool to the outside (posit
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Overlapping percentage for grid-based toolpath strategies.
Higher values increase accuracy and processing time.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">OverlapPercentValue</property>
</object>
<packing>
......@@ -2637,7 +2637,7 @@ Higher values increase accuracy and processing time.</property>
<property name="tooltip_text" translatable="yes">Material allowance determines the minimum distance that should be preserved between the tool and the model.
This value should be greater than zero for the first roughing operation or for inaccurate tools.
The last finishing operation should have zero material allowance.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">MaterialAllowanceValue</property>
<property name="digits">2</property>
</object>
......@@ -2655,7 +2655,7 @@ The last finishing operation should have zero material allowance.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The maximum height of each layer for all slicing toolpath strategies.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">MaxStepDownValue</property>
<property name="digits">2</property>
</object>
......@@ -2700,7 +2700,7 @@ The last finishing operation should have zero material allowance.</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Shift the position of the tool towards the outside (positive value) or inside (negative).
Usually you will want to use the cutter radius here to cut around the outline.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">EngraveOffsetValue</property>
<property name="digits">2</property>
</object>
......@@ -3138,7 +3138,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkEntry" id="BoundsName">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">30</property>
</object>
<packing>
......@@ -3251,7 +3251,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkSpinButton" id="boundary_x_low">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
<property name="adjustment">min-x</property>
<property name="digits">2</property>
......@@ -3269,7 +3269,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkSpinButton" id="boundary_y_high">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
<property name="adjustment">max-y</property>
<property name="digits">2</property>
......@@ -3287,7 +3287,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkSpinButton" id="boundary_z_low">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
<property name="adjustment">min-z</property>
<property name="digits">2</property>
......@@ -3305,7 +3305,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkSpinButton" id="boundary_z_high">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
<property name="adjustment">max-z</property>
<property name="digits">2</property>
......@@ -3323,7 +3323,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkSpinButton" id="boundary_y_low">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
<property name="adjustment">min-y</property>
<property name="digits">2</property>
......@@ -3341,7 +3341,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkSpinButton" id="boundary_x_high">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
<property name="adjustment">max-x</property>
<property name="digits">2</property>
......@@ -4020,7 +4020,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkEntry" id="TaskNameControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -4594,7 +4594,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">Δx:</property>
<property name="label" translatable="yes">&#x394;x:</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -4625,7 +4625,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">Δy:</property>
<property name="label" translatable="yes">&#x394;y:</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -4656,7 +4656,7 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">Δz:</property>
<property name="label" translatable="yes">&#x394;z:</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -5088,7 +5088,7 @@ ODE can't be used in combination with parallel processing or server mode.</prope
Leave this field empty if you are satisfied with the default: "ngc".
This is just a convenience setting. The "Export Toolpath" dialog
still allows you to choose the file extension freely.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">6</property>
</object>
<packing>
......@@ -5107,7 +5107,7 @@ still allows you to choose the file extension freely.</property>
<property name="tooltip_text" translatable="yes">Rapid moves are allowed at this z-level.
This should be clearly above the stock material.
Choose a small value to minimize rapid moves up and down.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SafetyHeightValue</property>
<property name="digits">1</property>
</object>
......@@ -5151,9 +5151,9 @@ machine time slightly since no-move commands do not
need to be processed at all.
Use the default (0.0) if you want to export all GCode
moves regardless of their length.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">7</property>
<property name="adjustment">GCodeMinimumStepValue</property>
<property name="adjustment">GCodeMinimumStepValue_x</property>
<property name="digits">5</property>
</object>
<packing>
......@@ -5169,7 +5169,7 @@ moves regardless of their length.</property>
<object class="GtkSpinButton" id="GCodeMinimumStep_y">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">7</property>
<property name="adjustment">GCodeMinimumStepValue_y</property>
<property name="digits">5</property>
......@@ -5187,7 +5187,7 @@ moves regardless of their length.</property>
<object class="GtkSpinButton" id="GCodeMinimumStep_z">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">7</property>
<property name="adjustment">GCodeMinimumStepValue_z</property>
<property name="digits">5</property>
......@@ -5307,7 +5307,7 @@ moves regardless of their length.</property>
<object class="GtkSpinButton" id="GCodeCornerStyleCAMTolerance">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">GCodeCornerStyleCAMToleranceValue</property>
<property name="digits">3</property>
</object>
......@@ -5324,7 +5324,7 @@ moves regardless of their length.</property>
<object class="GtkSpinButton" id="GCodeCornerStyleMotionTolerance">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">GCodeCornerStyleMotionToleranceValue</property>
<property name="digits">3</property>
</object>
......@@ -5937,7 +5937,7 @@ Hotkey: &lt;p&gt;</property>
<object class="GtkSpinButton" id="DrillProgressFrameSkipControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char">&#x2022;</property>
<property name="adjustment">DrillProgressMaxFPS</property>
</object>
<packing>
......@@ -6090,7 +6090,7 @@ Hotkey: &lt;p&gt;</property>
<object class="GtkEntry" id="ExternalProgramInkscapeControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -6102,7 +6102,7 @@ Hotkey: &lt;p&gt;</property>
<object class="GtkEntry" id="ExternalProgramPstoeditControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -6213,7 +6213,7 @@ Hotkey: &lt;p&gt;</property>
<object class="GtkSpinButton" id="NumberOfProcesses">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">NumberOfProcessesValue</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
......@@ -6343,7 +6343,7 @@ You will need a remote server.&lt;/span&gt;</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The TCP port of the remote server. You need to set a hostname or IP as well.
PyCAM's default port is 1250.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">RemoteServerPortValue</property>
</object>
<packing>
......@@ -6359,7 +6359,7 @@ PyCAM's default port is 1250.</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Type in a hostname or IP address if you want to connect to a remote PyCAM server.
Leave this field empty for a local-only server.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">18</property>
<property name="truncate_multiline">True</property>
</object>
......@@ -6415,7 +6415,7 @@ Leave this field empty for a local-only server.</property>
<property name="tooltip_text" translatable="yes">PyCAM will try to bind to this local TCP port. Other PyCAM clients may connect to this port if they know the shared secret.
Remember that you need administrative permissions for ports below 1024.
The default port is 1250.</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">ServerPortLocalValue</property>
</object>
<packing>
......@@ -6454,7 +6454,7 @@ The default port is 1250.</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">All servers and clients of a processing cloud must use the same shared secret.</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="truncate_multiline">True</property>
</object>
<packing>
......@@ -6643,8 +6643,8 @@ Sadly this problem is not too easy to solve. Future releases of PyCAM should rem
<property name="gravity">center</property>
<property name="program_name">PyCAM</property>
<property name="version">0.1</property>
<property name="copyright" translatable="yes">Copyright © 2008-2010 Lode Leroy
Copyright © 2010 Lars Kruse</property>
<property name="copyright" translatable="yes">Copyright &#xA9; 2008-2010 Lode Leroy
Copyright &#xA9; 2010 Lars Kruse</property>
<property name="comments" translatable="yes">Toolpath Generation for 3-Axis CNC machining</property>
<property name="website">http://sourceforge.net/projects/pycam/</property>
<property name="website_label" translatable="yes">Webseite des PyCAM-Projekts</property>
......@@ -7397,7 +7397,7 @@ Please read the description of the Server Mode (linked below) to understand the
<object class="GtkSpinButton" id="ProcessPoolRefreshInterval">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">ProcessPoolRefreshIntervalValue</property>
<property name="numeric">True</property>
</object>
......@@ -7968,7 +7968,7 @@ Please read the description of the Server Mode (linked below) to understand the
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">6</property>
<property name="invisible_char">●</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">SimulationDetailsValue</property>
</object>
<packing>
......@@ -8108,7 +8108,7 @@ upon interesting bugs and weird results.</property>
<property name="visible">True</property>
<property name="stock">gtk-zoom-fit</property>
</object>
<object class="GtkAdjustment" id="GCodeMinimumStepValue">
<object class="GtkAdjustment" id="GCodeMinimumStepValue_x">
<property name="upper">100</property>
<property name="step_increment">5.0000000000000002e-05</property>
</object>
......
src/pycam/Exporters/GCodeExporter.py
View file @ 14811aea
......@@ -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.0001, minimum_step_y=0.0001, minimum_step_z=0.0001):
minimum_step_x=0.0001, minimum_step_y=0.0001, minimum_step_z=0.0001):
if isinstance(destination, basestring):
# open the file
self.destination = file(destination,"w")
......@@ -53,7 +53,7 @@ class GCodeGenerator:
self.gcode = gcode(safetyheight=self.safety_height)
self.toggle_spindle_status = toggle_spindle_status
self.comment = comment
self._minimum_step = minimum_step
self._minimum_step_x = minimum_step_x
self._minimum_step_y = minimum_step_y
self._minimum_step_z = minimum_step_z
self._finished = False
......@@ -107,7 +107,7 @@ class GCodeGenerator:
self.append(self.gcode.delay(2))
# 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_x = self._minimum_step_x
#res_limit_y = self._minimum_step
#res_limit_z = self._minimum_step
res_limit_y = self._minimum_step_y
......
src/pycam/Gui/Project.py
View file @ 14811aea
......@@ -127,7 +127,7 @@ PREFERENCES_DEFAULTS = {
"simulation_details_level": 3,
"drill_progress_max_fps": 2,
"gcode_safety_height": 25.0,
"gcode_minimum_step": 0.0001,
"gcode_minimum_step_x": 0.0001,
"gcode_minimum_step_y": 0.0001,
"gcode_minimum_step_z": 0.0001,
"gcode_path_mode": 0,
......@@ -892,9 +892,9 @@ class ProjectGui:
self._task_property_signals.append((obj,
obj.connect("changed", self._handle_task_setting_change)))
# gcode settings
gcode_minimum_step = self.gui.get_object("GCodeMinimumStep_x")
self.settings.add_item("gcode_minimum_step",
gcode_minimum_step.get_value, gcode_minimum_step.set_value)
gcode_minimum_step_x = self.gui.get_object("GCodeMinimumStep_x")
self.settings.add_item("gcode_minimum_step_x",
gcode_minimum_step_x.get_value, gcode_minimum_step_x.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)
......@@ -3784,7 +3784,7 @@ 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_x=self.settings.get("gcode_minimum_step_x"),
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")
......
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