Skip to content

Commit bbc291a

Browse files
committed
Merge branch 'master' of https://github.com/Corna/pcb2gcodeGUI
2 parents f53bf12 + ca73317 commit bbc291a

File tree

3 files changed

+118
-125
lines changed

3 files changed

+118
-125
lines changed

mainwindow.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ const QString MainWindow::names[] = { "File", "Common", "Mill", "Drill", "Outlin
3030
MainWindow::MainWindow(QWidget *parent) :
3131
QMainWindow(parent),
3232
ui(new Ui::MainWindow),
33+
inputGroup(this),
34+
outputGroup(this),
3335
pcb2gcodeProcess(this),
3436
pcb2gcodeKilled(false),
3537
changeMetricImperialValues(true)
@@ -39,6 +41,13 @@ MainWindow::MainWindow(QWidget *parent) :
3941
ui->setupUi(this);
4042
this->setFixedSize(this->width(), this->height());
4143

44+
inputGroup.addButton(ui->inputMetricRadioButton, 0);
45+
inputGroup.addButton(ui->inputImperialRadioButton, 1);
46+
outputGroup.addButton(ui->outputMetricRadioButton, 0);
47+
outputGroup.addButton(ui->outputImperialRadioButton, 1);
48+
inputGroup.button(0)->setChecked(true);
49+
outputGroup.button(0)->setChecked(true);
50+
4251
input = new QWidgetPair<QRadioButton, QRadioButton>
4352
(ui->inputMetricRadioButton, ui->inputImperialRadioButton);
4453
output = new QWidgetPair<QRadioButton, QRadioButton>

mainwindow.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ private slots:
7777
void loadDefaultConfFile();
7878

7979
private:
80-
enum SystemOfMeasurement { METRIC, IMPERIAL };
8180
enum ArgsType { FILEARGS = 0, COMMONARGS = 1, MILLARGS = 2, DRILLARGS = 3, OUTLINEARGS = 4, AUTOLEVELLERARGS = 5 };
8281
static const QString names[];
8382

8483
Ui::MainWindow *ui;
8584

86-
8785
QString lastDir;
8886
QWidgetPair<QRadioButton, QRadioButton> *input;
8987
QWidgetPair<QRadioButton, QRadioButton> *output;
88+
QButtonGroup inputGroup;
89+
QButtonGroup outputGroup;
9090
QProcess pcb2gcodeProcess;
9191
bool pcb2gcodeKilled;
9292
bool changeMetricImperialValues;

0 commit comments

Comments
 (0)