Skip to content

Commit 8d8a2ab

Browse files
the-snowwhitethe-snowwhite
committed
Change obsoleted --dpi to --mirror-axis
Signed-off-by: Michael Brown <producer@holotronic.dk>
1 parent d2081e2 commit 8d8a2ab

2 files changed

Lines changed: 21 additions & 18 deletions

File tree

‎mainwindow.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MainWindow::MainWindow(QWidget *parent) :
8282
args[ COMMONARGS ].insert("tolerance", ui->toleranceDoubleSpinBox);
8383
args[ COMMONARGS ].insert("optimise", ui->optimiseDoubleSpinBox);
8484
args[ COMMONARGS ].insert("zero-start", ui->zerostartCheckBox);
85-
args[ COMMONARGS ].insert("dpi", ui->dpiSpinBox);
85+
args[ COMMONARGS ].insert("mirror-axis", ui->mirroraxisDoubleSpinBox);
8686
args[ COMMONARGS ].insert("tile-x", ui->tilexSpinBox);
8787
args[ COMMONARGS ].insert("tile-y", ui->tileySpinBox);
8888

@@ -194,6 +194,7 @@ MainWindow::MainWindow(QWidget *parent) :
194194

195195
ui->loadingLabel->setMovie(&loadingIcon);
196196
ui->loadingLabel->hide();
197+
ui->mirroraxisDoubleSpinBox->setEnabled(true);
197198
}
198199

199200
void MainWindow::checkPcb2gcodeVersion()
@@ -237,8 +238,6 @@ void MainWindow::checkPcb2gcodeVersion()
237238

238239
void MainWindow::vectorialEnable(bool enable)
239240
{
240-
ui->dpiSpinBox->setEnabled(!enable);
241-
242241
if (enable)
243242
{
244243
if (ui->voronoiCheckBox->isChecked())
@@ -492,7 +491,8 @@ void MainWindow::changeMetricInputUnits(bool metric)
492491
ui->zdrillDoubleSpinBox, ui->zchangeDoubleSpinBox, ui->cutterdiameterDoubleSpinBox,
493492
ui->zcutDoubleSpinBox, ui->cutinfeedDoubleSpinBox, ui->outlinewidthDoubleSpinBox,
494493
ui->bridgesDoubleSpinBox, ui->zbridgesDoubleSpinBox, ui->alxDoubleSpinBox,
495-
ui->alyDoubleSpinBox, ui->toleranceDoubleSpinBox, ui->optimiseDoubleSpinBox };
494+
ui->alyDoubleSpinBox, ui->toleranceDoubleSpinBox, ui->optimiseDoubleSpinBox,
495+
ui->mirroraxisDoubleSpinBox };
496496

497497
QSpinBox *spinBoxes[] = { ui->millfeedSpinBox, ui->drillfeedSpinBox, ui->cutfeedSpinBox, ui->alprobefeedSpinBox };
498498

‎mainwindow.ui‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@
563563
<item row="5" column="0" colspan="2">
564564
<widget class="QCheckBox" name="vectorialCheckBox">
565565
<property name="toolTip">
566-
<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>
566+
<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).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
567567
</property>
568568
<property name="text">
569569
<string>Vectorial core</string>
@@ -685,40 +685,43 @@
685685
</widget>
686686
</item>
687687
<item row="10" column="0">
688-
<widget class="QLabel" name="dpiLabel">
688+
<widget class="QLabel" name="mirroraxisLabel">
689689
<property name="toolTip">
690-
<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>
690+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--mirror-axis&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Distance from zero axis to flip the bcb around&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
691691
</property>
692692
<property name="text">
693-
<string>Internal precision</string>
693+
<string>Axis mirror offset</string>
694694
</property>
695695
<property name="buddy">
696-
<cstring>dpiSpinBox</cstring>
696+
<cstring>mirroraxisDoubleSpinBox</cstring>
697697
</property>
698698
</widget>
699699
</item>
700700
<item row="10" column="1">
701-
<widget class="QSpinBox" name="dpiSpinBox">
701+
<widget class="QDoubleSpinBox" name="mirroraxisDoubleSpinBox">
702702
<property name="enabled">
703-
<bool>false</bool>
703+
<bool>true</bool>
704704
</property>
705705
<property name="toolTip">
706-
<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>
706+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--mirror-axis&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Distance from zero axis to flip the bcb around&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
707707
</property>
708708
<property name="suffix">
709-
<string> dpi</string>
709+
<string> mm </string>
710+
</property>
711+
<property name="decimals">
712+
<number>3</number>
710713
</property>
711714
<property name="minimum">
712-
<number>1</number>
715+
<double>0.000000000000000</double>
713716
</property>
714717
<property name="maximum">
715-
<number>10000</number>
718+
<double>10000.000000000000000</double>
716719
</property>
717720
<property name="singleStep">
718-
<number>100</number>
721+
<double>1.000000000000000</double>
719722
</property>
720723
<property name="value">
721-
<number>1000</number>
724+
<double>0.000000000000000</double>
722725
</property>
723726
</widget>
724727
</item>
@@ -2276,7 +2279,7 @@
22762279
<tabstop>toleranceDoubleSpinBox</tabstop>
22772280
<tabstop>optimiseDoubleSpinBox</tabstop>
22782281
<tabstop>zerostartCheckBox</tabstop>
2279-
<tabstop>dpiSpinBox</tabstop>
2282+
<tabstop>mirroraxisDoubleSpinBox</tabstop>
22802283
<tabstop>tilexSpinBox</tabstop>
22812284
<tabstop>tileySpinBox</tabstop>
22822285
<tabstop>zworkDoubleSpinBox</tabstop>

0 commit comments

Comments
 (0)