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

Commit

Permalink
rich Epos GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
@MPIBR-tushevg
MPIBR-tushevg committed Dec 29, 2018
1 parent 037e8a9 commit e87d2c5
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 76 deletions.
40 changes: 23 additions & 17 deletions BrainATUMtome/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void MainWindow::configure_epos()
connect(ui->radioButton_epos_tension_on, &QRadioButton::toggled, this, &MainWindow::on_radioButtonsEposTensionToggled);

connect(ui->radioButton_epos_sync_off, &QRadioButton::toggled, this, &MainWindow::on_radioButtonsEposSyncToggled);
connect(ui->radioButton_epos_sync_on, &QRadioButton::toggled, this, &MainWindow::on_radioButtonsEposSyncToggled);
//connect(ui->radioButton_epos_sync_on, &QRadioButton::toggled, this, &MainWindow::on_radioButtonsEposSyncToggled);
}


Expand Down Expand Up @@ -90,21 +90,11 @@ void MainWindow::on_radioButtonsEposLowerToggled(bool checked)

}

emit ui->spinBox_epos_lower_velocity->editingFinished();
//emit ui->spinBox_epos_lower_velocity->editingFinished();
emit ui->spinBox_epos_lower_velocity->valueChanged(ui->spinBox_epos_lower_velocity->value());
}


void MainWindow::on_spinBox_epos_lower_velocity_editingFinished()
{
int velocity_value = ui->spinBox_epos_lower_velocity->value() * m_epos_direction_lower;
emit uirequest_epos_velocity(0, velocity_value);

if (ui->radioButton_epos_sync_on->isChecked()) {
ui->spinBox_epos_upper_velocity->setValue(ui->spinBox_epos_lower_velocity->value());
emit uirequest_epos_velocity(1, velocity_value);
}
}


void MainWindow::on_radioButtonsEposUpperToggled(bool checked)
{
Expand Down Expand Up @@ -137,10 +127,10 @@ void MainWindow::on_spinBox_epos_upper_velocity_editingFinished()
int velocity_value = ui->spinBox_epos_upper_velocity->value() * m_epos_direction_upper;
emit uirequest_epos_velocity(1, velocity_value);

if (ui->radioButton_epos_sync_on->isChecked()) {
ui->spinBox_epos_lower_velocity->setValue(ui->spinBox_epos_upper_velocity->value());
emit uirequest_epos_velocity(0, velocity_value);
}
//if (ui->radioButton_epos_sync_on->isChecked()) {
// ui->spinBox_epos_lower_velocity->setValue(ui->spinBox_epos_upper_velocity->value());
// emit uirequest_epos_velocity(0, velocity_value);
//}
}


Expand Down Expand Up @@ -175,6 +165,7 @@ void MainWindow::on_radioButtonsEposSyncToggled(bool checked)
// enable async mode
enable_epos_radioButtons(true);
}
/*
else if (ui->radioButton_epos_sync_on->isChecked()) {
ui->widget_board->on_log(EventLogType::Notify, "EPOS :: sync mode is on");
Expand All @@ -191,6 +182,7 @@ void MainWindow::on_radioButtonsEposSyncToggled(bool checked)
// enable sync mode
enable_epos_radioButtons(false);
}
*/
}


Expand Down Expand Up @@ -261,3 +253,17 @@ void MainWindow::on_checkBox_syringe_auto_toggled(bool checked)
{
emit uirequest_syringe_auto(checked);
}

void MainWindow::on_spinBox_epos_lower_velocity_valueChanged(int arg1)
{
qDebug() << "SPINBOX LOWER " << arg1;
int velocity_value = ui->spinBox_epos_lower_velocity->value() * m_epos_direction_lower;
emit uirequest_epos_velocity(0, velocity_value);

/*
if (ui->radioButton_epos_sync_on->isChecked()) {
ui->spinBox_epos_upper_velocity->setValue(ui->spinBox_epos_lower_velocity->value());
emit uirequest_epos_velocity(1, velocity_value);
}
*/
}
4 changes: 2 additions & 2 deletions BrainATUMtome/mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ private slots:
void on_radioButtonsEposUpperToggled(bool checked);
void on_radioButtonsEposTensionToggled(bool checked);
void on_radioButtonsEposSyncToggled(bool checked);
void on_spinBox_epos_lower_velocity_editingFinished();
void on_spinBox_epos_upper_velocity_editingFinished();
void on_spinBox_epos_lower_velocity_valueChanged(int arg1);

void on_spinBox_microtome_cuttingSpeed_editingFinished();
void on_comboBox_microtome_returnSpeed_activated(int index);
Expand All @@ -54,9 +54,9 @@ private slots:
void on_pushButton_microtome_stop_clicked();

void on_pushButton_syringe_pump_clicked();

void on_checkBox_syringe_auto_toggled(bool checked);


signals:
void uirequest_epos_velocity(int motorid, int velocity);
void uirequest_epos_tension(bool state);
Expand Down
163 changes: 106 additions & 57 deletions BrainATUMtome/mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,51 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>720</height>
<height>753</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout_9" stretch="4,1">
<layout class="QVBoxLayout" name="verticalLayout" stretch="5,1">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_controlsAndViewer" stretch="1,4">
<layout class="QHBoxLayout" name="horizontalLayout_controlsAndViewer" stretch="1,6">
<item>
<layout class="QVBoxLayout" name="verticalLayout_controls" stretch="3,4,1">
<layout class="QVBoxLayout" name="verticalLayout_controls">
<item>
<widget class="QGroupBox" name="groupBox_epos">
<property name="title">
<string>EPOS</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowstretch="5,2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_epos_lower">
<property name="title">
<string>MotorLower</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_epos_lower_velocity">
<widget class="QRadioButton" name="radioButton_epos_lower_cw">
<property name="text">
<string>CW</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_lower_ccw">
<property name="text">
<string>CCW</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_lower_off">
<property name="text">
<string>velocity [rpm]</string>
<string>OFF</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
Expand All @@ -55,42 +72,42 @@
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_lower_off">
<widget class="QLabel" name="label_epos_lower_velocity">
<property name="text">
<string>OFF</string>
</property>
<property name="checked">
<bool>true</bool>
<string>[rpm]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_epos_upper">
<property name="title">
<string>MotorUpper</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="radioButton_epos_lower_ccw">
<widget class="QRadioButton" name="radioButton_epos_upper_cw">
<property name="text">
<string>CCW</string>
<string>CW</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_lower_cw">
<widget class="QRadioButton" name="radioButton_epos_upper_ccw">
<property name="text">
<string>CW</string>
<string>CCW</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_epos_upper">
<property name="title">
<string>MotorUpper</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_epos_upper_velocity">
<widget class="QRadioButton" name="radioButton_epos_upper_off">
<property name="text">
<string>velocity [rpm]</string>
<string>OFF</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
Expand All @@ -111,7 +128,37 @@
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_upper_off">
<widget class="QLabel" name="label_epos_upper_velocity">
<property name="text">
<string>[rpm]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_epos_sync">
<property name="title">
<string>MotorSync</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QRadioButton" name="radioButton_epos_sync_cw">
<property name="text">
<string>CW</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_sync_ccw">
<property name="text">
<string>CCW</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_sync_off">
<property name="text">
<string>OFF</string>
</property>
Expand All @@ -121,23 +168,32 @@
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_upper_ccw">
<property name="text">
<string>CCW</string>
<widget class="QSpinBox" name="spinBox_epos_sync_velocity">
<property name="minimum">
<number>100</number>
</property>
<property name="maximum">
<number>15000</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1000</number>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_upper_cw">
<widget class="QLabel" name="label_epos_sync_velocity">
<property name="text">
<string>CW</string>
<string>[rpm]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_epos_tension">
<property name="title">
<string>Tension</string>
Expand All @@ -148,50 +204,43 @@
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QRadioButton" name="radioButton_epos_tension_off">
<widget class="QRadioButton" name="radioButton_epos_tension_on">
<property name="text">
<string>OFF</string>
</property>
<property name="checked">
<bool>true</bool>
<string>ON</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_tension_on">
<widget class="QRadioButton" name="radioButton_epos_tension_off">
<property name="text">
<string>ON</string>
<string>OFF</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_epos_sync">
<item row="3" column="1">
<widget class="QGroupBox" name="groupBox_epos_status">
<property name="title">
<string>Sync</string>
<string>Status</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QRadioButton" name="radioButton_epos_sync_off">
<widget class="QLineEdit" name="lineEdit_epos_status">
<property name="text">
<string>OFF</string>
<string>00:00:00 / 0</string>
</property>
<property name="checked">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_epos_sync_on">
<property name="text">
<string>ON</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down

0 comments on commit e87d2c5

Please sign in to comment.