Skip to content

Commit 891d12f

Browse files
cornacorna
committed
Add --zchange-absolute
1 parent f6d05e6 commit 891d12f

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

‎mainwindow.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ MainWindow::MainWindow(QWidget *parent) :
7878
args[ COMMONARGS ].insert("metricoutput", &outputUnits);
7979
args[ COMMONARGS ].insert("zsafe", ui->zsafeDoubleSpinBox);
8080
args[ COMMONARGS ].insert("zchange", ui->zchangeDoubleSpinBox);
81+
args[ COMMONARGS ].insert("zchange-absolute", ui->zchangeAbsoluteCheckBox);
8182
args[ COMMONARGS ].insert("vectorial", ui->vectorialCheckBox);
8283
args[ COMMONARGS ].insert("nog64", ui->nog64CheckBox);
8384
args[ COMMONARGS ].insert("tolerance", ui->toleranceDoubleSpinBox);

‎mainwindow.ui‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>850</width>
10-
<height>555</height>
10+
<height>582</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -43,7 +43,7 @@
4343
<property name="minimumSize">
4444
<size>
4545
<width>445</width>
46-
<height>455</height>
46+
<height>485</height>
4747
</size>
4848
</property>
4949
<property name="toolTip">
@@ -375,11 +375,11 @@
375375
<x>10</x>
376376
<y>10</y>
377377
<width>421</width>
378-
<height>417</height>
378+
<height>441</height>
379379
</rect>
380380
</property>
381381
<layout class="QGridLayout" name="commonGridLayout">
382-
<item row="5" column="0">
382+
<item row="6" column="0">
383383
<widget class="QCheckBox" name="nog64CheckBox">
384384
<property name="toolTip">
385385
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--nog64&lt;/span&gt;&lt;/p&gt;&lt;p&gt;do not explicitly set G64 inside the output gcode. This option makes the gcode compatible with low-end cnc controllers (like grbl)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -395,7 +395,7 @@
395395
</property>
396396
</widget>
397397
</item>
398-
<item row="6" column="0">
398+
<item row="7" column="0">
399399
<widget class="QLabel" name="toleranceLabel">
400400
<property name="toolTip">
401401
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--tolerance&lt;/span&gt;&lt;/p&gt;&lt;p&gt;maximum deviation from toolpath&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -430,7 +430,7 @@
430430
</property>
431431
</widget>
432432
</item>
433-
<item row="10" column="1">
433+
<item row="11" column="1">
434434
<widget class="QSpinBox" name="dpiSpinBox">
435435
<property name="enabled">
436436
<bool>false</bool>
@@ -468,7 +468,7 @@
468468
</property>
469469
</widget>
470470
</item>
471-
<item row="10" column="0">
471+
<item row="11" column="0">
472472
<widget class="QLabel" name="dpiLabel">
473473
<property name="toolTip">
474474
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--dpi&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Resolution used internally&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -481,7 +481,7 @@
481481
</property>
482482
</widget>
483483
</item>
484-
<item row="7" column="0">
484+
<item row="8" column="0">
485485
<widget class="QCheckBox" name="optimiseCheckBox">
486486
<property name="toolTip">
487487
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--optimise&lt;/span&gt;&lt;/p&gt;&lt;p&gt;optimise output gcode, reducing its output size up to 95%, while accepting a very little loss of precision&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -494,7 +494,7 @@
494494
</property>
495495
</widget>
496496
</item>
497-
<item row="8" column="0">
497+
<item row="9" column="0">
498498
<widget class="QCheckBox" name="zerostartCheckBox">
499499
<property name="toolTip">
500500
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--zero-start&lt;/span&gt;&lt;/p&gt;&lt;p&gt;set the starting point of the project at (0,0). With this option the projet will be between (0,0) and (max_x_value, max_y_value) (positive values)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -507,7 +507,7 @@
507507
</property>
508508
</widget>
509509
</item>
510-
<item row="6" column="1">
510+
<item row="7" column="1">
511511
<widget class="QDoubleSpinBox" name="toleranceDoubleSpinBox">
512512
<property name="enabled">
513513
<bool>true</bool>
@@ -671,7 +671,7 @@
671671
</item>
672672
</layout>
673673
</item>
674-
<item row="11" column="1">
674+
<item row="12" column="1">
675675
<layout class="QHBoxLayout" name="tileHorizontalLayout">
676676
<item>
677677
<widget class="QLabel" name="tilexLabel">
@@ -727,7 +727,7 @@
727727
</item>
728728
</layout>
729729
</item>
730-
<item row="11" column="0">
730+
<item row="12" column="0">
731731
<widget class="QLabel" name="tileLabel">
732732
<property name="toolTip">
733733
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--tile-x&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;--tile-y&lt;/span&gt;&lt;/p&gt;&lt;p&gt;number of tiling rows/columns&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -737,7 +737,7 @@
737737
</property>
738738
</widget>
739739
</item>
740-
<item row="4" column="0">
740+
<item row="5" column="0">
741741
<widget class="QCheckBox" name="vectorialCheckBox">
742742
<property name="toolTip">
743743
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--vectorial&lt;/span&gt;&lt;/p&gt;&lt;p&gt;enable the new vectorial core. This new core offers much better performances, higher precision, smaller output files and support for internal cutoffs (like thermal pads). When --vectorial is enabled, --dpi is ignored.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -750,7 +750,7 @@
750750
</property>
751751
</widget>
752752
</item>
753-
<item row="9" column="1">
753+
<item row="10" column="1">
754754
<layout class="QHBoxLayout" name="mirrorAbsoluteHorizontalLayout">
755755
<item>
756756
<widget class="QRadioButton" name="mirrorAbsoluteOffRadioButton">
@@ -783,7 +783,7 @@
783783
</item>
784784
</layout>
785785
</item>
786-
<item row="9" column="0">
786+
<item row="10" column="0">
787787
<widget class="QLabel" name="mirrorAbsoluteLabel">
788788
<property name="toolTip">
789789
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--mirror-absolute&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Mirror operations on the back side along the Y axis instead of the board center, which is the default&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -793,7 +793,7 @@
793793
</property>
794794
</widget>
795795
</item>
796-
<item row="12" column="0" colspan="2">
796+
<item row="13" column="0" colspan="2">
797797
<spacer name="verticalSpacer_7">
798798
<property name="orientation">
799799
<enum>Qt::Vertical</enum>
@@ -806,6 +806,16 @@
806806
</property>
807807
</spacer>
808808
</item>
809+
<item row="4" column="0" colspan="2">
810+
<widget class="QCheckBox" name="zchangeAbsoluteCheckBox">
811+
<property name="toolTip">
812+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--zchange-absolute&lt;/span&gt;&lt;/p&gt;&lt;p&gt;use zchange as a machine coordinates height (G53)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
813+
</property>
814+
<property name="text">
815+
<string>Use &quot;Tool change height&quot; as machine coordinate</string>
816+
</property>
817+
</widget>
818+
</item>
809819
</layout>
810820
</widget>
811821
</widget>
@@ -992,7 +1002,7 @@
9921002
<item row="3" column="0">
9931003
<widget class="QCheckBox" name="voronoiCheckBox">
9941004
<property name="enabled">
995-
<bool>false</bool>
1005+
<bool>true</bool>
9961006
</property>
9971007
<property name="toolTip">
9981008
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--voronoi&lt;/span&gt;&lt;/p&gt;&lt;p&gt;enable the voronoi mode (requires --vectorial). This option is more efficient than a large --offset value, and provides the same result.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -2146,7 +2156,7 @@
21462156
<x>0</x>
21472157
<y>0</y>
21482158
<width>850</width>
2149-
<height>28</height>
2159+
<height>25</height>
21502160
</rect>
21512161
</property>
21522162
<widget class="QMenu" name="menuFile">

0 commit comments

Comments
 (0)