diff --git a/BrainATUMtome/eventlog.cpp b/BrainATUMtome/eventlog.cpp index bf48855..59e8f7f 100644 --- a/BrainATUMtome/eventlog.cpp +++ b/BrainATUMtome/eventlog.cpp @@ -17,7 +17,8 @@ void EventLog::addMessageToBoard(const QString &message, QBrush brush) { QTextCharFormat textFormat = this->currentCharFormat(); textFormat.setForeground(brush); - this->setCurrentCharFormat(textFormat); + //this->setCurrentCharFormat(textFormat); + this->mergeCurrentCharFormat(textFormat); this->appendPlainText(message); this->verticalScrollBar()->setValue(this->verticalScrollBar()->maximum()); } @@ -25,18 +26,19 @@ void EventLog::addMessageToBoard(const QString &message, QBrush brush) void EventLog::on_log(EventLogType type, const QString &message) { - auto brush = QBrush(); + QBrush brush = QBrush(Qt::SolidPattern); if (type == EventLogType::Notify) { brush.setColor(Qt::black); } - else if (type == EventLogType::Log) { + else if (type == EventLogType::Respond) { brush.setColor(Qt::gray); } else if (type == EventLogType::Warn) { brush.setColor(Qt::red); } + QString logMessage = message; if (m_useTimestamp) { QString timestamp = QDateTime::currentDateTime().toString("[yyyyMMdd hh:mm:ss]"); diff --git a/BrainATUMtome/eventlog.h b/BrainATUMtome/eventlog.h index 85b4331..2b6ec87 100644 --- a/BrainATUMtome/eventlog.h +++ b/BrainATUMtome/eventlog.h @@ -7,8 +7,10 @@ #include #include +#include -enum class EventLogType {Notify, Log, Warn}; + +enum class EventLogType {Notify, Respond, Warn}; class EventLog : public QPlainTextEdit { diff --git a/BrainATUMtome/mainwindow.cpp b/BrainATUMtome/mainwindow.cpp index 538acfc..84742c1 100644 --- a/BrainATUMtome/mainwindow.cpp +++ b/BrainATUMtome/mainwindow.cpp @@ -5,10 +5,19 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), m_epos_velocity_lower(0), - m_epos_velocity_upper(0) + m_epos_velocity_upper(0), + m_microtome_cuttingSpeed(0), + m_microtome_returnSpeed(0), + m_microtome_feedStep(0), + m_microtome_sections(0), + m_microtome_advanceRemaining(0) { ui->setupUi(this); + connect(ui->radioButton_epos_lower_off, &QRadioButton::toggled, this, &MainWindow::on_eposLowerToggled); + connect(ui->radioButton_epos_lower_ccw, &QRadioButton::toggled, this, &MainWindow::on_eposLowerToggled); + connect(ui->radioButton_epos_lower_cw, &QRadioButton::toggled, this, &MainWindow::on_eposLowerToggled); + } @@ -18,7 +27,29 @@ MainWindow::~MainWindow() } -void MainWindow::on_groupBox_epos_tension_toggled(bool arg1) +void MainWindow::on_eposLowerToggled(bool checked) { + if (!checked) + return; + + emit ui->spinBox_epos_lower_velocity->editingFinished(); + + if (ui->radioButton_epos_lower_off->isChecked()) { + ui->widget_board->on_log(EventLogType::Notify, "LOWER OFF"); + m_epos_velocity_lower = 0; + } + else if (ui->radioButton_epos_lower_ccw->isChecked()) { + ui->widget_board->on_log(EventLogType::Notify, "LOWER CCW"); + } + else if (ui->radioButton_epos_lower_cw->isChecked()) { + ui->widget_board->on_log(EventLogType::Notify, "LOWER CW"); + m_epos_velocity_lower = -m_epos_velocity_lower; + } + ui->widget_board->on_log(EventLogType::Respond, "EPOS :: velocity lower " + QString::number(m_epos_velocity_lower)); +} + +void MainWindow::on_spinBox_epos_lower_velocity_editingFinished() +{ + m_epos_velocity_lower = ui->spinBox_epos_lower_velocity->value(); } diff --git a/BrainATUMtome/mainwindow.h b/BrainATUMtome/mainwindow.h index a17e820..1f82b0d 100644 --- a/BrainATUMtome/mainwindow.h +++ b/BrainATUMtome/mainwindow.h @@ -4,6 +4,8 @@ #include #include +#include "eventlog.h" + namespace Ui { class MainWindow; } @@ -16,17 +18,20 @@ class MainWindow : public QMainWindow explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); -private slots: - - - - void on_groupBox_epos_tension_toggled(bool arg1); - private: Ui::MainWindow *ui; int m_epos_velocity_lower; int m_epos_velocity_upper; + int m_microtome_cuttingSpeed; + int m_microtome_returnSpeed; + int m_microtome_feedStep; + int m_microtome_sections; + int m_microtome_advanceRemaining; + +private slots: + void on_eposLowerToggled(bool checked); + void on_spinBox_epos_lower_velocity_editingFinished(); signals: void uirequest_epos_velocity(int motorid, int velocity);