From d0cfbd177bfec277a51efa7595220c9866497fc5 Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 26 Apr 2017 13:57:36 +0900 Subject: [PATCH] =?UTF-8?q?GUI=20V0.1.10=20(=EC=9D=B4=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B0=B0=ED=8F=AC)=20=20-=20=EC=BB=B4?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocook.cpp | 4 +-- app/gui/oven_control/mainwindow.cpp | 8 ++--- app/gui/oven_control/mainwindow.h | 2 +- app/gui/oven_control/manualcookwindow.cpp | 18 +++++----- app/gui/oven_control/manualcookwindow.h | 4 +-- app/gui/oven_control/oven.cpp | 56 ++++++++++++------------------- app/gui/oven_control/oven.h | 14 +++----- 7 files changed, 45 insertions(+), 61 deletions(-) diff --git a/app/gui/oven_control/autocook.cpp b/app/gui/oven_control/autocook.cpp index 4807aa3..fe730e4 100644 --- a/app/gui/oven_control/autocook.cpp +++ b/app/gui/oven_control/autocook.cpp @@ -26,7 +26,7 @@ void AutoCook::startStep() startHumidity = oven->currentHumidity(); startTemp = oven->currentTemp(); isWaitingDoorOpened_ = false; - oven->setMode(Oven::CombinationMode); + oven->setMode(currentStep.mode); oven->setHumidity(currentStep.humidity); oven->setTemp(currentStep.temp); oven->setFan(currentStep.fan); @@ -39,7 +39,7 @@ void AutoCook::startStep() startHumidity = oven->currentHumidity(); startTemp = oven->currentTemp(); isWaitingDoorOpened_ = false; - oven->setMode(Oven::CombinationMode); + oven->setMode(currentStep.mode); oven->setHumidity(currentStep.humidity); oven->setTemp(currentStep.temp); oven->setFan(currentStep.fan); diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp index cabb4bf..6ba8a60 100644 --- a/app/gui/oven_control/mainwindow.cpp +++ b/app/gui/oven_control/mainwindow.cpp @@ -25,7 +25,7 @@ MainWindow::~MainWindow() delete ui; } -void MainWindow::showManualCookWindow(Oven::Mode mode) +void MainWindow::showManualCookWindow(Define::Mode mode) { ManualCookWindow *w = new ManualCookWindow(this, mode); w->setWindowModality(Qt::WindowModal); @@ -43,17 +43,17 @@ void MainWindow::showAutoCookSelectionWindow(Define::CookType type) void MainWindow::on_steamButton_clicked() { - showManualCookWindow(Oven::SteamMode); + showManualCookWindow(Define::SteamMode); } void MainWindow::on_combiButton_clicked() { - showManualCookWindow(Oven::CombinationMode); + showManualCookWindow(Define::CombiMode); } void MainWindow::on_dryheatButton_clicked() { - showManualCookWindow(Oven::HeatMode); + showManualCookWindow(Define::DryMode); } void MainWindow::on_poultryButton_clicked() diff --git a/app/gui/oven_control/mainwindow.h b/app/gui/oven_control/mainwindow.h index 177906a..07262b0 100644 --- a/app/gui/oven_control/mainwindow.h +++ b/app/gui/oven_control/mainwindow.h @@ -19,7 +19,7 @@ public: ~MainWindow(); private slots: - void showManualCookWindow(Oven::Mode mode); + void showManualCookWindow(Define::Mode mode); void showAutoCookSelectionWindow(Define::CookType type); void on_steamButton_clicked(); diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 777a752..76cca91 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -10,7 +10,7 @@ #include -ManualCookWindow::ManualCookWindow(QWidget *parent, Oven::Mode mode) : +ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : QMainWindow(parent), ui(new Ui::ManualCookWindow) { @@ -188,13 +188,13 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) { switch (oven->mode()) { - case Oven::HeatMode: + case Define::DryMode: ui->dryheatButton->setChecked(true); break; - case Oven::SteamMode: + case Define::SteamMode: ui->steamButton->setChecked(true); break; - case Oven::CombinationMode: + case Define::CombiMode: ui->combiButton->setChecked(true); break; default: @@ -204,7 +204,7 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) bool old; old = ui->humiditySlider->blockSignals(true); ui->humiditySlider->setValue(oven->humidity()); - ui->humiditySlider->setEnabled(oven->mode() == Oven::CombinationMode); + ui->humiditySlider->setEnabled(oven->mode() == Define::CombiMode); ui->humiditySlider->blockSignals(old); old = ui->tempSlider->blockSignals(true); @@ -305,7 +305,7 @@ QPushButton:pressed {\ updateLabels(); } -void ManualCookWindow::setOvenDefault(Oven::Mode mode) +void ManualCookWindow::setOvenDefault(Define::Mode mode) { stop(); @@ -328,17 +328,17 @@ void ManualCookWindow::stop() void ManualCookWindow::on_steamButton_clicked() { - setOvenDefault(Oven::SteamMode); + setOvenDefault(Define::SteamMode); } void ManualCookWindow::on_combiButton_clicked() { - setOvenDefault(Oven::CombinationMode); + setOvenDefault(Define::CombiMode); } void ManualCookWindow::on_dryheatButton_clicked() { - setOvenDefault(Oven::HeatMode); + setOvenDefault(Define::DryMode); } void ManualCookWindow::on_humidityButton_pressed() diff --git a/app/gui/oven_control/manualcookwindow.h b/app/gui/oven_control/manualcookwindow.h index f4ca85e..f487173 100644 --- a/app/gui/oven_control/manualcookwindow.h +++ b/app/gui/oven_control/manualcookwindow.h @@ -15,7 +15,7 @@ class ManualCookWindow : public QMainWindow Q_OBJECT public: - explicit ManualCookWindow(QWidget *parent, Oven::Mode mode); + explicit ManualCookWindow(QWidget *parent, Define::Mode mode); ~ManualCookWindow(); signals: @@ -25,7 +25,7 @@ public slots: private slots: void setupAnimation(); - void setOvenDefault(Oven::Mode mode); + void setOvenDefault(Define::Mode mode); void start(); void stop(); void checkTime(); diff --git a/app/gui/oven_control/oven.cpp b/app/gui/oven_control/oven.cpp index 2a1e69c..7af2828 100644 --- a/app/gui/oven_control/oven.cpp +++ b/app/gui/oven_control/oven.cpp @@ -51,19 +51,19 @@ void Oven::setInterface(OvenInterface *interface) connect(interface, SIGNAL(doorClosed()), this, SLOT(onDoorClosed())); } -void Oven::setMode(Mode mode) +void Oven::setMode(Define::Mode mode) { if (setMode_(mode)) emit changed(this); } -bool Oven::setMode_(Mode mode) +bool Oven::setMode_(Define::Mode mode) { switch (mode) { - case HeatMode: - case SteamMode: - case CombinationMode: + case Define::DryMode: + case Define::SteamMode: + case Define::CombiMode: break; default: return false; @@ -72,19 +72,7 @@ bool Oven::setMode_(Mode mode) if (mode != mode_) { mode_ = mode; - - switch (mode) - { - case HeatMode: - interface->setMode(Define::DryMode); - break; - case SteamMode: - interface->setMode(Define::SteamMode); - break; - case CombinationMode: - interface->setMode(Define::CombiMode); - break; - } + interface->setMode(mode); return true; } @@ -92,20 +80,20 @@ bool Oven::setMode_(Mode mode) return false; } -void Oven::setDefault(Mode mode) +void Oven::setDefault(Define::Mode mode) { setMode_(mode); switch (mode) { - case HeatMode: + case Define::DryMode: setHumidity_(0); setTemp_(160); break; - case SteamMode: + case Define::SteamMode: setHumidity_(100); setTemp_(100); break; - case CombinationMode: + case Define::CombiMode: setHumidity_(50); setTemp_(100); break; @@ -776,11 +764,11 @@ int Oven::maxTemp() { switch (mode()) { - case HeatMode: + case Define::DryMode: return 300; - case SteamMode: + case Define::SteamMode: return 130; - case CombinationMode: + case Define::CombiMode: return 300; default: return 0; @@ -791,11 +779,11 @@ int Oven::minTemp() { switch (mode()) { - case HeatMode: + case Define::DryMode: return 30; - case SteamMode: + case Define::SteamMode: return 30; - case CombinationMode: + case Define::CombiMode: return 30; default: return 0; @@ -806,11 +794,11 @@ int Oven::maxInterTemp() { switch (mode()) { - case HeatMode: + case Define::DryMode: return 99; - case SteamMode: + case Define::SteamMode: return 99; - case CombinationMode: + case Define::CombiMode: return 99; default: return 0; @@ -821,11 +809,11 @@ int Oven::minInterTemp() { switch (mode()) { - case HeatMode: + case Define::DryMode: return 30; - case SteamMode: + case Define::SteamMode: return 30; - case CombinationMode: + case Define::CombiMode: return 30; default: return 0; diff --git a/app/gui/oven_control/oven.h b/app/gui/oven_control/oven.h index 7e57093..2b87f9f 100644 --- a/app/gui/oven_control/oven.h +++ b/app/gui/oven_control/oven.h @@ -52,13 +52,9 @@ class Oven : public QObject { Q_OBJECT -public: - enum Mode { HeatMode, SteamMode, CombinationMode }; - -private: explicit Oven(QObject *parent = 0); - Mode mode_; + Define::Mode mode_; int humidity_; int temp_; int time_; @@ -120,7 +116,7 @@ public: return instance; } - Mode mode() { return mode_; } + Define::Mode mode() { return mode_; } int humidity() { return humidity_; } int temp() { return temp_; } int time(); @@ -160,8 +156,8 @@ signals: void doorOpened(); public slots: - void setMode(Mode mode); - void setDefault(Mode mode); + void setMode(Define::Mode mode); + void setDefault(Define::Mode mode); void setHumidity(int percentage); void setTemp(int celsius); void setTime(int secs); @@ -199,7 +195,7 @@ public slots: void setInterface(OvenInterface *interface); private slots: - bool setMode_(Mode mode); + bool setMode_(Define::Mode mode); bool setHumidity_(int percentage); bool setTemp_(int celsius); bool setInterTempEnabled_(bool enabled); -- 2.1.4