Commit 62e6723642cfab27e30d81ee21ebc8e6e4f91abe
1 parent
44c81f0cb1
Exists in
master
and in
2 other branches
자동 요리 중 중심 온도 활성화 상태에서 중심 온도계가 빠졌을 경우 대응 기능 추가
Showing
4 changed files
with
65 additions
and
0 deletions
Show diff stats
app/gui/oven_control/autocook.cpp
| @@ -476,6 +476,11 @@ int AutoCook::remainingTime() | @@ -476,6 +476,11 @@ int AutoCook::remainingTime() | ||
| 476 | } | 476 | } |
| 477 | } | 477 | } |
| 478 | 478 | ||
| 479 | +bool AutoCook::isCoreTempActivated() | ||
| 480 | +{ | ||
| 481 | + return checkingCoreTemp; | ||
| 482 | +} | ||
| 483 | + | ||
| 479 | int AutoCook::msecs() | 484 | int AutoCook::msecs() |
| 480 | { | 485 | { |
| 481 | if (done_) | 486 | if (done_) |
app/gui/oven_control/autocook.h
| @@ -18,6 +18,7 @@ public: | @@ -18,6 +18,7 @@ public: | ||
| 18 | int remainingTime(); | 18 | int remainingTime(); |
| 19 | bool isWaitingDoorOpened() { return isWaitingDoorOpened_; } | 19 | bool isWaitingDoorOpened() { return isWaitingDoorOpened_; } |
| 20 | bool done() { return done_; } | 20 | bool done() { return done_; } |
| 21 | + bool isCoreTempActivated(); | ||
| 21 | 22 | ||
| 22 | int msecs(); | 23 | int msecs(); |
| 23 | 24 |
app/gui/oven_control/autocookwindow.cpp
| @@ -195,6 +195,11 @@ void AutoCookWindow::setupUi() | @@ -195,6 +195,11 @@ void AutoCookWindow::setupUi() | ||
| 195 | ui->closeDoorAnimation->hide(); | 195 | ui->closeDoorAnimation->hide(); |
| 196 | ui->closeDoorArrow->hide(); | 196 | ui->closeDoorArrow->hide(); |
| 197 | 197 | ||
| 198 | + ui->thermometerAnimation->load(":/images/animation/thermometer_01.png"); | ||
| 199 | + ui->thermometerAnimation->load(":/images/animation/thermometer_02.png"); | ||
| 200 | + ui->thermometerAnimation->start(300); | ||
| 201 | + ui->thermometerAnimation->hide(); | ||
| 202 | + | ||
| 198 | lastViewCookMode = Define::InvalidMode; | 203 | lastViewCookMode = Define::InvalidMode; |
| 199 | lastViewCookType = Define::Invalid; | 204 | lastViewCookType = Define::Invalid; |
| 200 | lastViewCoreTemp = 999; | 205 | lastViewCoreTemp = 999; |
| @@ -633,6 +638,46 @@ void AutoCookWindow::updateView() | @@ -633,6 +638,46 @@ void AutoCookWindow::updateView() | ||
| 633 | ui->heatGauge->setValue(temp); | 638 | ui->heatGauge->setValue(temp); |
| 634 | } | 639 | } |
| 635 | } | 640 | } |
| 641 | + | ||
| 642 | + if (autocook.isCoreTempActivated()) | ||
| 643 | + { | ||
| 644 | + if (ui->thermometerAnimation->isVisible()) | ||
| 645 | + { | ||
| 646 | + if (oven->currentInterTemp() + 20 < oven->currentTemp()) | ||
| 647 | + ui->thermometerAnimation->hide(); | ||
| 648 | + } | ||
| 649 | + else | ||
| 650 | + { | ||
| 651 | + if (oven->currentInterTemp() >= oven->currentTemp()) | ||
| 652 | + ui->thermometerAnimation->show(); | ||
| 653 | + } | ||
| 654 | + } | ||
| 655 | + | ||
| 656 | + if (ui->thermometerAnimation->isVisible()) | ||
| 657 | + { | ||
| 658 | + ui->cookModeIcon->hide(); | ||
| 659 | + ui->cookStepAnimation->hide(); | ||
| 660 | + ui->cookStepIcon->hide(); | ||
| 661 | + ui->cookStepLabel->hide(); | ||
| 662 | + ui->doorStepLabel->hide(); | ||
| 663 | + ui->heatGauge->hide(); | ||
| 664 | + ui->heatGaugeButton->hide(); | ||
| 665 | + ui->heatLabel->hide(); | ||
| 666 | + ui->humidityGauge->hide(); | ||
| 667 | + ui->humidityGaugeButton->hide(); | ||
| 668 | + ui->humidityLabel->hide(); | ||
| 669 | + ui->infoButton->hide(); | ||
| 670 | + ui->showNextStepButton->hide(); | ||
| 671 | + ui->showPrevStepButton->hide(); | ||
| 672 | + ui->stepIndicator->hide(); | ||
| 673 | + } | ||
| 674 | + else | ||
| 675 | + { | ||
| 676 | + ui->infoButton->show(); | ||
| 677 | + ui->showNextStepButton->show(); | ||
| 678 | + ui->showPrevStepButton->show(); | ||
| 679 | + ui->stepIndicator->show(); | ||
| 680 | + } | ||
| 636 | } | 681 | } |
| 637 | 682 | ||
| 638 | void AutoCookWindow::checkCook() | 683 | void AutoCookWindow::checkCook() |
app/gui/oven_control/autocookwindow.ui
| @@ -1360,6 +1360,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o | @@ -1360,6 +1360,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o | ||
| 1360 | </rect> | 1360 | </rect> |
| 1361 | </property> | 1361 | </property> |
| 1362 | </widget> | 1362 | </widget> |
| 1363 | + <widget class="AnimatedImageBox" name="thermometerAnimation"> | ||
| 1364 | + <property name="geometry"> | ||
| 1365 | + <rect> | ||
| 1366 | + <x>345</x> | ||
| 1367 | + <y>800</y> | ||
| 1368 | + <width>210</width> | ||
| 1369 | + <height>307</height> | ||
| 1370 | + </rect> | ||
| 1371 | + </property> | ||
| 1372 | + <property name="text"> | ||
| 1373 | + <string/> | ||
| 1374 | + </property> | ||
| 1375 | + </widget> | ||
| 1363 | <zorder>openDoorAnimation</zorder> | 1376 | <zorder>openDoorAnimation</zorder> |
| 1364 | <zorder>closeDoorAnimation</zorder> | 1377 | <zorder>closeDoorAnimation</zorder> |
| 1365 | <zorder>upperStack</zorder> | 1378 | <zorder>upperStack</zorder> |
| @@ -1393,6 +1406,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o | @@ -1393,6 +1406,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o | ||
| 1393 | <zorder>heatGaugeButton</zorder> | 1406 | <zorder>heatGaugeButton</zorder> |
| 1394 | <zorder>processContainer</zorder> | 1407 | <zorder>processContainer</zorder> |
| 1395 | <zorder>stepIndicator</zorder> | 1408 | <zorder>stepIndicator</zorder> |
| 1409 | + <zorder>thermometerAnimation</zorder> | ||
| 1396 | </widget> | 1410 | </widget> |
| 1397 | </widget> | 1411 | </widget> |
| 1398 | <customwidgets> | 1412 | <customwidgets> |