diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index f3abd3e..cf7bb2f 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -19,7 +19,8 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : QMainWindow(parent), - ui(new Ui::ManualCookWindow) + ui(new Ui::ManualCookWindow), + repeat(false) { ui->setupUi(this); @@ -43,15 +44,15 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : connect(ui->interTempSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabels())); startCookingTimer.setSingleShot(true); - startCookingTimer.setInterval(3000); + startCookingTimer.setInterval(2000); connect(&startCookingTimer, SIGNAL(timeout()), SLOT(start())); showCurrentHumidityTimer.setSingleShot(true); - showCurrentHumidityTimer.setInterval(3000); + showCurrentHumidityTimer.setInterval(2000); connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity())); showCurrentTempTimer.setSingleShot(true); - showCurrentTempTimer.setInterval(3000); + showCurrentTempTimer.setInterval(2000); connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp())); oven->setDefault(mode); @@ -115,6 +116,22 @@ void ManualCookWindow::checkTime() { oven->stopCooking(); } + + if (repeat && !oven->cooking()) + { + repeat = false; + + ui->repeatButton->setStyleSheet("\ +QPushButton { background-image: url(:/images/manual_button/repeat.png); }\ +QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }"); + + oven->setMode(repeatSetting.mode); + oven->setHumidity(repeatSetting.humidity); + oven->setTemp(repeatSetting.temp); + oven->setTime(repeatSetting.time); + oven->setInterTempEnabled(repeatSetting.coreTempEnabled); + oven->setInterTemp(repeatSetting.coreTemp); + } } void ManualCookWindow::showCurrentHumidity() @@ -300,6 +317,19 @@ QPushButton:pressed {\ else ui->upperStack->setCurrentIndex(0); + if (oven->cooking() || oven->cooldown() || oven->preheating()) + { + ui->reserveButton->hide(); + ui->favoriteButton->hide(); + ui->repeatButton->show(); + } + else + { + ui->reserveButton->show(); + ui->favoriteButton->show(); + ui->repeatButton->hide(); + } + updateLabels(); } @@ -442,7 +472,26 @@ void ManualCookWindow::on_humidificationButton_clicked() void ManualCookWindow::on_repeatButton_clicked() { - + if (repeat) + { + repeat = false; + ui->repeatButton->setStyleSheet("\ +QPushButton { background-image: url(:/images/manual_button/repeat.png); }\ +QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }"); + } + else + { + repeat = true; + ui->repeatButton->setStyleSheet("\ +QPushButton { background-image: url(:/images/manual_button/repeat_ov.png); }\ +QPushButton:pressed { background-image: url(:/images/manual_button/repeat.png); }"); + repeatSetting.mode = oven->mode(); + repeatSetting.humidity = oven->humidity(); + repeatSetting.temp= oven->temp(); + repeatSetting.time = oven->time(); + repeatSetting.coreTempEnabled = oven->interTempEnabled(); + repeatSetting.coreTemp = oven->interTemp(); + } } void ManualCookWindow::on_cooldownButton_clicked() @@ -456,10 +505,29 @@ void ManualCookWindow::on_cooldownButton_clicked() void ManualCookWindow::on_reserveButton_clicked() { - -} - -void ManualCookWindow::on_favoritesButton_clicked() +// if (isReserved) +// { +// isReserved = false; +// ui->reserveButton->setStyleSheet("\ +//QPushButton { background-image: url(:/images/manual_button/reserve.png); }\ +//QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); }"); +// } +// else +// { +// isReserved = true; +// ui->reserveButton->setStyleSheet("\ +//QPushButton { background-image: url(:/images/manual_button/reserve_ov.png); }\ +//QPushButton:pressed { background-image: url(:/images/manual_button/reserve.png); }"); +// reserved.mode = oven->mode(); +// reserved.humidity = oven->humidity(); +// reserved.temp= oven->temp(); +// reserved.time = oven->time(); +// reserved.coreTempEnabled = oven->interTempEnabled(); +// reserved.coreTemp = oven->interTemp(); +// } +} + +void ManualCookWindow::on_favoriteButton_clicked() { if (oven->cooking()) return; diff --git a/app/gui/oven_control/manualcookwindow.h b/app/gui/oven_control/manualcookwindow.h index b8e7fa2..5d45304 100644 --- a/app/gui/oven_control/manualcookwindow.h +++ b/app/gui/oven_control/manualcookwindow.h @@ -57,7 +57,7 @@ private slots: void on_repeatButton_clicked(); void on_cooldownButton_clicked(); void on_reserveButton_clicked(); - void on_favoritesButton_clicked(); + void on_favoriteButton_clicked(); void on_goBackStackButton_clicked(); void on_goFrontStackButton_clicked(); @@ -82,6 +82,9 @@ private: bool showCurrentHumidity_ = false; bool showCurrentTemp_ = false; + + ManualCookSetting repeatSetting; + bool repeat; }; #endif // MANUALCOOKWINDOW_H diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 4c2cc43..0e9eaf6 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -249,7 +249,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); } - + 402 @@ -942,7 +942,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.p true - + 336 @@ -1249,14 +1249,14 @@ QPushButton:pressed { image: url(:/images/slider_icon/time_ov.png); } 1 - AnimatedImageBox + WashWarnIcon QLabel -
animatedimagebox.h
+
washwarnicon.h
- WashWarnIcon + AnimatedImageBox QLabel -
washwarnicon.h
+
animatedimagebox.h