Skip to content

Commit c11994c

Browse files
the-snowwhitethe-snowwhite
committed
Remove --vectorial as its now mandatory
Signed-off-by: Michael Brown <producer@holotronic.dk>
1 parent b7c2a90 commit c11994c

3 files changed

Lines changed: 38 additions & 50 deletions

File tree

‎mainwindow.cpp‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ MainWindow::MainWindow(QWidget *parent) :
7777
args[ COMMONARGS ].insert("zsafe", ui->zsafeDoubleSpinBox);
7878
args[ COMMONARGS ].insert("zchange", ui->zchangeDoubleSpinBox);
7979
args[ COMMONARGS ].insert("zchange-absolute", ui->zchangeAbsoluteCheckBox);
80-
args[ COMMONARGS ].insert("vectorial", ui->vectorialCheckBox);
80+
// args[ COMMONARGS ].insert("vectorial", ui->vectorialCheckBox);
8181
args[ COMMONARGS ].insert("nog64", ui->nog64CheckBox);
8282
args[ COMMONARGS ].insert("tolerance", ui->toleranceDoubleSpinBox);
8383
args[ COMMONARGS ].insert("optimise", ui->optimiseDoubleSpinBox);
@@ -148,9 +148,9 @@ MainWindow::MainWindow(QWidget *parent) :
148148
connect(ui->postamblePushButton, SIGNAL(clicked()), this, SLOT(getPostambleFile()));
149149
connect(ui->outputDirPushButton, SIGNAL(clicked()), this, SLOT(getOutputDirectory()));
150150

151-
connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), this, SLOT(vectorialEnable(bool)));
152-
connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), this, SLOT(bridgesAvailable()));
153-
connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), ui->voronoiCheckBox, SLOT(setEnabled(bool)));
151+
// connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), this, SLOT(vectorialEnable(bool)));
152+
// connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), this, SLOT(bridgesAvailable()));
153+
// connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), ui->voronoiCheckBox, SLOT(setEnabled(bool)));
154154
connect(ui->voronoiCheckBox, SIGNAL(toggled(bool)), this, SLOT(voronoiEnable(bool)));
155155
connect(ui->milldrillCheckBox, SIGNAL(toggled(bool)), ui->milldrilldiameterDoubleSpinBox, SLOT(setEnabled(bool)));
156156
connect(ui->softwareComboBox, SIGNAL(currentTextChanged(QString)), this, SLOT(updateAlCustomEnableState(QString)));
@@ -236,18 +236,18 @@ void MainWindow::checkPcb2gcodeVersion()
236236
}
237237
}
238238

239-
void MainWindow::vectorialEnable(bool enable)
240-
{
241-
if (enable)
242-
{
243-
if (ui->voronoiCheckBox->isChecked())
244-
ui->extrapassesSpinBox->setEnabled(false);
245-
}
246-
else
247-
{
248-
ui->extrapassesSpinBox->setEnabled(true);
249-
}
250-
}
239+
// void MainWindow::vectorialEnable(bool enable)
240+
// {
241+
// if (enable)
242+
// {
243+
// if (ui->voronoiCheckBox->isChecked())
244+
// ui->extrapassesSpinBox->setEnabled(false);
245+
// }
246+
// else
247+
// {
248+
// ui->extrapassesSpinBox->setEnabled(true);
249+
// }
250+
// }
251251

252252
void MainWindow::voronoiEnable(bool enable)
253253
{
@@ -257,7 +257,7 @@ void MainWindow::voronoiEnable(bool enable)
257257

258258
void MainWindow::bridgesAvailable()
259259
{
260-
bool bridgesEnabled = ui->vectorialCheckBox->isChecked();
260+
bool bridgesEnabled = true;
261261

262262
ui->bridgesDoubleSpinBox->setEnabled(bridgesEnabled);
263263
ui->zbridgesDoubleSpinBox->setEnabled(bridgesEnabled);
@@ -345,7 +345,7 @@ void MainWindow::generateImages()
345345
ui->loadingLabel->show();
346346

347347
currentImagesFolder = imagesFolder;
348-
vectorial = ui->vectorialCheckBox->isChecked();
348+
// vectorial = ui->vectorialCheckBox->isChecked();
349349
fillOutline = ui->filloutlineCheckBox->isChecked();
350350
pcb2gcodeImageProcess.start(PCB2GCODE_EXECUTABLE, arguments, QProcess::ReadOnly);
351351
}
@@ -372,10 +372,10 @@ void MainWindow::imagesGenerated(int exitCode, QProcess::ExitStatus exitStatus)
372372
{
373373
QDir dir(currentImagesFolder);
374374

375-
if (vectorial)
376-
dir.setNameFilters(QStringList() << "*.svg");
377-
else
378-
dir.setNameFilters(QStringList() << "*.png");
375+
// if (vectorial)
376+
// dir.setNameFilters(QStringList() << "*.svg");
377+
// else
378+
// dir.setNameFilters(QStringList() << "*.png");
379379

380380
dir.setFilter(QDir::Files);
381381

@@ -392,7 +392,8 @@ void MainWindow::imagesGenerated(int exitCode, QProcess::ExitStatus exitStatus)
392392
addImageFile(dir, tr("Input front"), "original_front");
393393
addImageFile(dir, tr("Input back"), "original_back");
394394
addImageFile(dir, tr("Input drill"), "original_drill");
395-
addImageFile(dir, tr("Input outline"), (fillOutline && !vectorial) ? "outline_filled" : "original_outline");
395+
// addImageFile(dir, tr("Input outline"), (fillOutline && !vectorial) ? "outline_filled" : "original_outline");
396+
addImageFile(dir, tr("Input outline"), (fillOutline) ? "outline_filled" : "original_outline");
396397
addImageFile(dir, tr("Input outline"), "original_outline");
397398
}
398399
else if (sender() != static_cast<QObject *>(&pcb2gcodeProcess) && !restarted) //Errors from pcb2gcodeProcess are printed in outputWindow
@@ -604,7 +605,7 @@ void MainWindow::startPcb2gcode()
604605
outputTextEdit = pcb2gcodeOutputWindow->getOutputPlainTextEdit();
605606

606607
currentImagesFolder = ui->outputDirLineEdit->text();
607-
vectorial = ui->vectorialCheckBox->isChecked();
608+
// vectorial = ui->vectorialCheckBox->isChecked();
608609
fillOutline = ui->filloutlineCheckBox->isChecked();
609610
pcb2gcodeProcess.start(PCB2GCODE_EXECUTABLE, arguments, QProcess::ReadOnly);
610611
}

‎mainwindow.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class MainWindow : public QMainWindow
5252
~MainWindow();
5353

5454
private slots:
55-
void vectorialEnable(bool enable);
55+
// void vectorialEnable(bool enable);
5656
void voronoiEnable(bool disable);
5757
void bridgesAvailable();
5858
void changeMetricInputUnits(bool metric);
@@ -115,7 +115,7 @@ private slots:
115115
const QString imagesFolder;
116116
QStringList imagesFilename;
117117
QString currentImagesFolder;
118-
bool vectorial;
118+
// bool vectorial;
119119
bool fillOutline;
120120
bool restarted;
121121

‎mainwindow.ui‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -561,19 +561,6 @@
561561
</widget>
562562
</item>
563563
<item row="5" column="0" colspan="2">
564-
<widget class="QCheckBox" name="vectorialCheckBox">
565-
<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).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
567-
</property>
568-
<property name="text">
569-
<string>Vectorial core</string>
570-
</property>
571-
<property name="checked">
572-
<bool>true</bool>
573-
</property>
574-
</widget>
575-
</item>
576-
<item row="6" column="0" colspan="2">
577564
<widget class="QCheckBox" name="nog64CheckBox">
578565
<property name="toolTip">
579566
<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>
@@ -589,7 +576,7 @@
589576
</property>
590577
</widget>
591578
</item>
592-
<item row="7" column="0">
579+
<item row="6" column="0">
593580
<widget class="QLabel" name="toleranceLabel">
594581
<property name="toolTip">
595582
<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>
@@ -602,7 +589,7 @@
602589
</property>
603590
</widget>
604591
</item>
605-
<item row="7" column="1">
592+
<item row="6" column="1">
606593
<widget class="QDoubleSpinBox" name="toleranceDoubleSpinBox">
607594
<property name="enabled">
608595
<bool>true</bool>
@@ -630,7 +617,7 @@
630617
</property>
631618
</widget>
632619
</item>
633-
<item row="8" column="0">
620+
<item row="7" column="0">
634621
<widget class="QLabel" name="optimiseLabel">
635622
<property name="toolTip">
636623
<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>
@@ -643,7 +630,7 @@
643630
</property>
644631
</widget>
645632
</item>
646-
<item row="8" column="1">
633+
<item row="7" column="1">
647634
<widget class="QDoubleSpinBox" name="optimiseDoubleSpinBox">
648635
<property name="enabled">
649636
<bool>true</bool>
@@ -652,7 +639,7 @@
652639
<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>
653640
</property>
654641
<property name="suffix">
655-
<string> in</string>
642+
<string> mm </string>
656643
</property>
657644
<property name="decimals">
658645
<number>5</number>
@@ -671,7 +658,7 @@
671658
</property>
672659
</widget>
673660
</item>
674-
<item row="9" column="0" colspan="2">
661+
<item row="8" column="0" colspan="2">
675662
<widget class="QCheckBox" name="zerostartCheckBox">
676663
<property name="toolTip">
677664
<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>
@@ -684,7 +671,7 @@
684671
</property>
685672
</widget>
686673
</item>
687-
<item row="10" column="0">
674+
<item row="9" column="0">
688675
<widget class="QLabel" name="mirroraxisLabel">
689676
<property name="toolTip">
690677
<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>
@@ -697,7 +684,7 @@
697684
</property>
698685
</widget>
699686
</item>
700-
<item row="10" column="1">
687+
<item row="9" column="1">
701688
<widget class="QDoubleSpinBox" name="mirroraxisDoubleSpinBox">
702689
<property name="enabled">
703690
<bool>true</bool>
@@ -725,7 +712,7 @@
725712
</property>
726713
</widget>
727714
</item>
728-
<item row="11" column="0">
715+
<item row="10" column="0">
729716
<widget class="QLabel" name="tileLabel">
730717
<property name="toolTip">
731718
<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>
@@ -735,7 +722,7 @@
735722
</property>
736723
</widget>
737724
</item>
738-
<item row="11" column="1">
725+
<item row="10" column="1">
739726
<layout class="QHBoxLayout" name="tileHorizontalLayout">
740727
<item>
741728
<widget class="QLabel" name="tilexLabel">
@@ -791,7 +778,7 @@
791778
</item>
792779
</layout>
793780
</item>
794-
<item row="12" column="0" colspan="2">
781+
<item row="11" column="0" colspan="2">
795782
<spacer name="verticalSpacer_7">
796783
<property name="orientation">
797784
<enum>Qt::Vertical</enum>

0 commit comments

Comments
 (0)