Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
fix ui
Browse files Browse the repository at this point in the history
  • Loading branch information
MPIBR-tushevg committed Dec 7, 2018
1 parent ec74a24 commit c8818a6
Show file tree
Hide file tree
Showing 3 changed files with 512 additions and 430 deletions.
31 changes: 20 additions & 11 deletions BrainATUMtome/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,16 @@ MainWindow::~MainWindow()

void MainWindow::configure_controlEpos()
{
//connect(ui->pushButton_epos_lower_cw, &Q)
connect(ui->pushButton_epos_lower_cw, &QPushButton::clicked, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->pushButton_epos_upper_cw->setChecked(true);});
connect(ui->pushButton_epos_lower_ccw, &QPushButton::clicked, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->pushButton_epos_upper_ccw->setChecked(true);});
connect(ui->pushButton_epos_lower_off, &QPushButton::clicked, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->pushButton_epos_upper_off->setChecked(true);});
connect(ui->lineEdit_epos_lower_rpm, &QLineEdit::returnPressed, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->lineEdit_epos_upper_rpm->setText(ui->lineEdit_epos_lower_rpm->text());});

connect(ui->pushButton_epos_upper_cw, &QPushButton::clicked, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->pushButton_epos_lower_cw->setChecked(true);});
connect(ui->pushButton_epos_upper_ccw, &QPushButton::clicked, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->pushButton_epos_lower_ccw->setChecked(true);});
connect(ui->pushButton_epos_upper_off, &QPushButton::clicked, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->pushButton_epos_lower_off->setChecked(true);});
connect(ui->lineEdit_epos_upper_rpm, &QLineEdit::returnPressed, [this](){if (ui->pushButton_epos_sync_on->isChecked()) ui->lineEdit_epos_lower_rpm->setText(ui->lineEdit_epos_upper_rpm->text());});

}


Expand Down Expand Up @@ -236,20 +245,20 @@ void MainWindow::on_pushButton_dep_run_clicked()



void MainWindow::on_pushButton_dmt_cut_clicked()
void MainWindow::on_pushButton_mtm_cut_clicked()
{
if (QString::compare(ui->pushButton_dmt_cut->text(), "Cut") == 0)
if (QString::compare(ui->pushButton_mtm_cut->text(), "Cut") == 0)
{
ui->pushButton_dmt_cut->setText("Stop");
emit uirequest_dmt_setCuttingSpeed(ui->lineEdit_dmt_cuttingSpeed->text().toUInt());
emit uirequest_dmt_setReturnSpeed(ui->comboBox_dmt_returnSpeed->currentText().toUInt());
emit uirequest_dmt_setFeed(ui->lineEdit_dmt_feedStep->text().toUInt());
emit uirequest_dmt_cuttingMotorOn();
ui->pushButton_mtm_cut->setText("Stop");
emit uirequest_mtm_setCuttingSpeed(ui->lineEdit_mtm_cuttingSpeed->text().toUInt());
emit uirequest_mtm_setReturnSpeed(ui->comboBox_mtm_returnSpeed->currentText().toUInt());
emit uirequest_mtm_setFeed(ui->lineEdit_mtm_feedStep->text().toUInt());
emit uirequest_mtm_cuttingMotorOn();
}
else if (QString::compare(ui->pushButton_dmt_cut->text(), "Stop") == 0)
else if (QString::compare(ui->pushButton_mtm_cut->text(), "Stop") == 0)
{
ui->pushButton_dmt_cut->setText("Cut");
emit uirequest_dmt_cuttingMotroOff();
ui->pushButton_mtm_cut->setText("Cut");
emit uirequest_mtm_cuttingMotroOff();
}
}

Expand Down
12 changes: 6 additions & 6 deletions BrainATUMtome/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ class MainWindow : public QMainWindow
private slots:
void on_error_throw(const QString &errorSource, const QString &errorMessage);
void on_pushButton_dep_run_clicked();
void on_pushButton_dmt_cut_clicked();
void on_pushButton_mtm_cut_clicked();
void on_lineEdit_dep_velocity_returnPressed();

signals:
void uirequest_dmt_setCuttingSpeed(quint32 value);
void uirequest_dmt_setReturnSpeed(quint32 value);
void uirequest_dmt_setFeed(quint16 value);
void uirequest_dmt_cuttingMotorOn();
void uirequest_dmt_cuttingMotroOff();
void uirequest_mtm_setCuttingSpeed(quint32 value);
void uirequest_mtm_setReturnSpeed(quint32 value);
void uirequest_mtm_setFeed(quint16 value);
void uirequest_mtm_cuttingMotorOn();
void uirequest_mtm_cuttingMotroOff();

void uirequest_dep_run(quint8 motor, qint16 velocity, bool direction, bool tension);
};
Expand Down
Loading

0 comments on commit c8818a6

Please sign in to comment.