Skip to content

P
pyMKcam
Commit 7b34cbe7 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.  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
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 81 deletions
share/ui/pycam-project.ui
View file @ 7b34cbe7
......@@ -279,7 +279,6 @@
<child>
<object class="GtkVBox" id="WindowBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkNotebook" id="MainTabs">
......@@ -288,7 +287,6 @@
<child>
<object class="GtkVBox" id="ModelTab">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkHBox" id="hbox4">
......@@ -296,7 +294,6 @@
<child>
<object class="GtkVSeparator" id="vseparator6">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -325,11 +322,9 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkVButtonBox" id="rotate directions">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="x-axis">
......@@ -400,7 +395,6 @@
<child>
<object class="GtkVSeparator" id="vseparator3">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -410,11 +404,9 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkVButtonBox" id="flip directions">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="xy-plane">
<property name="label" translatable="yes">xy-plane</property>
......@@ -484,7 +476,6 @@
<child>
<object class="GtkVSeparator" id="vseparator4">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -494,11 +485,9 @@
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkVButtonBox" id="swap directions">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="x &lt;-&gt; y">
<property name="label" translatable="yes">x &lt;-&gt; y</property>
......@@ -610,7 +599,6 @@
<child>
<object class="GtkVBox" id="scale_box">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkHBox" id="hbox6">
......@@ -765,7 +753,6 @@
<child>
<object class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -786,7 +773,6 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkTable" id="table1">
......@@ -929,7 +915,6 @@
<child>
<object class="GtkVSeparator" id="vseparator12">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -948,7 +933,6 @@
<child>
<object class="GtkVBox" id="vbox29">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkButton" id="ToggleModelDirectionButton">
......@@ -1049,7 +1033,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox17">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox26">
<property name="visible">True</property>
......@@ -1082,7 +1065,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="SupportGridDetailsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkExpander" id="GridProfileExpander">
<property name="visible">True</property>
......@@ -1131,7 +1113,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVSeparator" id="vseparator10">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -1354,7 +1335,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVSeparator" id="vseparator2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -1405,7 +1385,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox24">
<property name="visible">True</property>
......@@ -1444,7 +1423,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVSeparator" id="vseparator7">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -1493,7 +1471,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="SupportGridPositionManualShiftBox">
<property name="visible">True</property>
......@@ -1772,7 +1749,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="ToolTab">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkFrame" id="ToolEditorFrame">
......@@ -1787,7 +1763,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkHBox" id="hbox9">
......@@ -1842,7 +1817,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkButton" id="ToolListAdd">
......@@ -1912,7 +1886,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="ToolSettingsControlsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkHSeparator" id="hseparator8">
......@@ -1984,7 +1957,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox19">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<property name="homogeneous">True</property>
<child>
......@@ -2048,7 +2020,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVSeparator" id="vseparator5">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -2303,7 +2274,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="ProcessTab">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkFrame" id="ProcessEditorFrame">
......@@ -2318,7 +2288,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkHBox" id="hbox11">
......@@ -2364,7 +2333,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox20">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkButton" id="ProcessListAdd">
......@@ -2434,7 +2402,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="ProcessSettingsControlsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkHSeparator" id="hseparator7">
......@@ -2500,7 +2467,6 @@ The projection plane is usually at z=0. Only in case of models completely above
<child>
<object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property>
<child>
<object class="GtkRadioButton" id="PushRemoveStrategy">
......@@ -2602,7 +2568,6 @@ Use the "Engrave Offset" to shift the position of the tool to the outside (posit
<child>
<object class="GtkVSeparator" id="vseparator9">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -2843,7 +2808,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="GridDirectionX">
<property name="label" translatable="yes">x</property>
......@@ -2894,7 +2858,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVSeparator" id="vseparator8">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -2917,7 +2880,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox33">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="MillingStyleConventional">
<property name="label" translatable="yes">conventional / up</property>
......@@ -3036,7 +2998,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox25">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkHBox" id="hbox21">
......@@ -3079,7 +3040,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkButton" id="BoundsListAdd">
......@@ -3149,7 +3109,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="BoundsSettingsControlsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkHSeparator" id="hseparator3">
......@@ -3216,7 +3175,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox23">
<property name="visible">True</property>
......@@ -3224,7 +3182,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox27">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkRadioButton" id="BoundsTypeRelativeMargin">
......@@ -3277,7 +3234,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVSeparator" id="vseparator11">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -3677,7 +3633,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox26">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="BoundsMarginTypeRelativeLabel">
<property name="visible">True</property>
......@@ -3774,7 +3729,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="TasksTab">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkFrame" id="TaskListFrame">
......@@ -3788,7 +3742,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox18">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkHBox" id="hbox19">
......@@ -3844,7 +3797,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox22">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkButton" id="GenerateToolPathButton">
......@@ -3944,7 +3896,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="TaskDetails">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator13">
<property name="visible">True</property>
......@@ -4154,7 +4105,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
</child>
<child>
<object class="GtkVBox" id="ToolPathTab">
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkFrame" id="ToolPathTableFrame">
......@@ -4278,7 +4228,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkButton" id="toolpath_simulate">
......@@ -4420,7 +4369,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkToggleButton" id="ShowToolpathProgressButton">
<property name="label" translatable="yes">Show Progress</property>
......@@ -4502,7 +4450,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="view3dbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property>
<child>
<object class="GtkHBox" id="ViewControls">
......@@ -4522,7 +4469,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVSeparator" id="vseparator13">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -4906,7 +4852,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="logo">
......@@ -4928,7 +4873,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkFrame" id="GeneralSettingsFrame">
......@@ -4942,7 +4886,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<child>
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkCheckButton" id="SettingEnableODE">
......@@ -5117,12 +5060,11 @@ ODE can't be used in combination with parallel processing or server mode.</prope
<child>
<object class="GtkVBox" id="vbox30">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkTable" id="table14">
<property name="visible">True</property>
<property name="n_rows">3</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">2</property>
......@@ -5190,7 +5132,7 @@ Choose a small value to minimize rapid moves up and down.</property>
<object class="GtkLabel" id="GCodeMinimumStepLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Minimum step size:</property>
<property name="label" translatable="yes">Minimum step size x-axis:</property>
</object>
<packing>
<property name="top_attach">2</property>
......@@ -5199,7 +5141,7 @@ Choose a small value to minimize rapid moves up and down.</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="GCodeMinimumStep">
<object class="GtkSpinButton" id="GCodeMinimumStep_x">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Specify the minimum step width of your machine.
......@@ -5223,6 +5165,66 @@ moves regardless of their length.</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="GCodeMinimumStep_y">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">7</property>
<property name="adjustment">GCodeMinimumStepValue_y</property>
<property name="digits">5</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="GCodeMinimumStep_z">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="width_chars">7</property>
<property name="adjustment">GCodeMinimumStepValue_z</property>
<property name="digits">5</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="GCodeMinimumStepLabel1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Minimum step size y-axis:</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="GCodeMinimumStepLabel2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Minimum step size z-axis:</property>
</object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
......@@ -5255,7 +5257,6 @@ moves regardless of their length.</property>
<child>
<object class="GtkVBox" id="vbox31">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkHBox" id="hbox27">
......@@ -5433,7 +5434,6 @@ moves regardless of their length.</property>
<child>
<object class="GtkVBox" id="PreferencesVisibleItemsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkCheckButton" id="ShowModelCheckBox">
......@@ -5857,7 +5857,6 @@ for contour lines and toolpaths, triangle's normals, et cetera).</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkCheckButton" id="OpenGLPolygon">
......@@ -6151,7 +6150,6 @@ Hotkey: &lt;p&gt;</property>
<child>
<object class="GtkVBox" id="vbox34">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="EnableParallelProcesses">
......@@ -6169,7 +6167,6 @@ Hotkey: &lt;p&gt;</property>
<child>
<object class="GtkVBox" id="ParallelProcessSettingsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkAlignment" id="alignment45">
......@@ -6299,7 +6296,6 @@ You will need a remote server.&lt;/span&gt;</property>
<child>
<object class="GtkVBox" id="vbox36">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox34">
<property name="visible">True</property>
......@@ -6452,7 +6448,6 @@ The default port is 1250.</property>
<child>
<object class="GtkVBox" id="vbox37">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkEntry" id="ServerPassword">
<property name="visible">True</property>
......@@ -6665,7 +6660,6 @@ You should have received a copy of the GNU General Public License along with thi
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<placeholder/>
......@@ -6724,7 +6718,6 @@ You should have received a copy of the GNU General Public License along with thi
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkFrame" id="UnitChangeFrame">
......@@ -6738,7 +6731,6 @@ You should have received a copy of the GNU General Public License along with thi
<child>
<object class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="UnitChangeHelpLabel">
<property name="visible">True</property>
......@@ -7015,7 +7007,6 @@ Any selected group of dimensions will be scaled accordingly.</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
......@@ -7181,16 +7172,13 @@ Any selected group of dimensions will be scaled accordingly.</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox32">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="ProcessPoolStatisticsBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow4">
......@@ -7346,7 +7334,6 @@ Any selected group of dimensions will be scaled accordingly.</property>
<child>
<object class="GtkVBox" id="ProcessPoolDisabledBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="ProcessPoolDisabledLabel">
<property name="visible">True</property>
......@@ -7486,7 +7473,6 @@ Please read the description of the Server Mode (linked below) to understand the
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox8">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="FontDialogProperties">
......@@ -7962,12 +7948,10 @@ Please read the description of the Server Mode (linked below) to understand the
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox9">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox23">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkHBox" id="hbox20">
......@@ -8133,4 +8117,14 @@ upon interesting bugs and weird results.</property>
<property name="upper">100</property>
<property name="step_increment">5.0000000000000002e-05</property>
</object>
<object class="GtkAdjustment" id="GCodeMinimumStepValue_y">
<property name="value">0.00025000000000000001</property>
<property name="upper">100</property>
<property name="step_increment">5.0000000000000002e-05</property>
</object>
<object class="GtkAdjustment" id="GCodeMinimumStepValue_z">
<property name="value">0.00025000000000000001</property>
<property name="upper">100</property>
<property name="step_increment">5.0000000000000002e-05</property>
</object>
</interface>
src/pycam/Exporters/GCodeExporter.py
View file @ 7b34cbe7
......@@ -54,6 +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._finished = False
if comment:
self.add_comment(comment)
......@@ -108,6 +110,8 @@ class GCodeGenerator:
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
old_position = None
for pos, rapid in moves:
new_position = pos
......
src/pycam/Gui/Project.py
View file @ 7b34cbe7
......@@ -883,9 +883,15 @@ 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")
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_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")
self.settings.add_item("gcode_safety_height",
gcode_safety_height.get_value, gcode_safety_height.set_value)
......@@ -3764,6 +3770,8 @@ class ProjectGui:
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"))
path_mode = self.settings.get("gcode_path_mode")
PATH_MODES = pycam.Exporters.GCodeExporter.PATH_MODES
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