From 62e6723642cfab27e30d81ee21ebc8e6e4f91abe Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 28 Jul 2017 12:47:51 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EC=9A=94=EB=A6=AC=20?= =?UTF-8?q?=EC=A4=91=20=EC=A4=91=EC=8B=AC=20=EC=98=A8=EB=8F=84=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=20=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=A4=91=EC=8B=AC=20=EC=98=A8=EB=8F=84=EA=B3=84=EA=B0=80=20?= =?UTF-8?q?=EB=B9=A0=EC=A1=8C=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocook.cpp | 5 ++++ app/gui/oven_control/autocook.h | 1 + app/gui/oven_control/autocookwindow.cpp | 45 +++++++++++++++++++++++++++++++++ app/gui/oven_control/autocookwindow.ui | 14 ++++++++++ 4 files changed, 65 insertions(+) diff --git a/app/gui/oven_control/autocook.cpp b/app/gui/oven_control/autocook.cpp index 0ecf7c6..b3d716d 100644 --- a/app/gui/oven_control/autocook.cpp +++ b/app/gui/oven_control/autocook.cpp @@ -476,6 +476,11 @@ int AutoCook::remainingTime() } } +bool AutoCook::isCoreTempActivated() +{ + return checkingCoreTemp; +} + int AutoCook::msecs() { if (done_) diff --git a/app/gui/oven_control/autocook.h b/app/gui/oven_control/autocook.h index 5ec435e..da86109 100644 --- a/app/gui/oven_control/autocook.h +++ b/app/gui/oven_control/autocook.h @@ -18,6 +18,7 @@ public: int remainingTime(); bool isWaitingDoorOpened() { return isWaitingDoorOpened_; } bool done() { return done_; } + bool isCoreTempActivated(); int msecs(); diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index c58f771..7cf444d 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -195,6 +195,11 @@ void AutoCookWindow::setupUi() ui->closeDoorAnimation->hide(); ui->closeDoorArrow->hide(); + ui->thermometerAnimation->load(":/images/animation/thermometer_01.png"); + ui->thermometerAnimation->load(":/images/animation/thermometer_02.png"); + ui->thermometerAnimation->start(300); + ui->thermometerAnimation->hide(); + lastViewCookMode = Define::InvalidMode; lastViewCookType = Define::Invalid; lastViewCoreTemp = 999; @@ -633,6 +638,46 @@ void AutoCookWindow::updateView() ui->heatGauge->setValue(temp); } } + + if (autocook.isCoreTempActivated()) + { + if (ui->thermometerAnimation->isVisible()) + { + if (oven->currentInterTemp() + 20 < oven->currentTemp()) + ui->thermometerAnimation->hide(); + } + else + { + if (oven->currentInterTemp() >= oven->currentTemp()) + ui->thermometerAnimation->show(); + } + } + + if (ui->thermometerAnimation->isVisible()) + { + ui->cookModeIcon->hide(); + ui->cookStepAnimation->hide(); + ui->cookStepIcon->hide(); + ui->cookStepLabel->hide(); + ui->doorStepLabel->hide(); + ui->heatGauge->hide(); + ui->heatGaugeButton->hide(); + ui->heatLabel->hide(); + ui->humidityGauge->hide(); + ui->humidityGaugeButton->hide(); + ui->humidityLabel->hide(); + ui->infoButton->hide(); + ui->showNextStepButton->hide(); + ui->showPrevStepButton->hide(); + ui->stepIndicator->hide(); + } + else + { + ui->infoButton->show(); + ui->showNextStepButton->show(); + ui->showPrevStepButton->show(); + ui->stepIndicator->show(); + } } void AutoCookWindow::checkCook() diff --git a/app/gui/oven_control/autocookwindow.ui b/app/gui/oven_control/autocookwindow.ui index 194cbf9..0380a2b 100644 --- a/app/gui/oven_control/autocookwindow.ui +++ b/app/gui/oven_control/autocookwindow.ui @@ -1360,6 +1360,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o + + + + 345 + 800 + 210 + 307 + + + + + + openDoorAnimation closeDoorAnimation upperStack @@ -1393,6 +1406,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o heatGaugeButton processContainer stepIndicator + thermometerAnimation -- 2.1.4