Commit 8765fbc7758887cf39a3aee13e30a86b58a31d36
1 parent
1c813898f1
Exists in
master
and in
2 other branches
수동 요리의 예열 모드 동작 개선
- 문이 열린 상태에서도 문제 없이 동작하도록 수정 - 시간 표시 수정
Showing
2 changed files
with
7 additions
and
5 deletions
Show diff stats
app/gui/oven_control/oven.cpp
| ... | ... | @@ -395,8 +395,8 @@ void Oven::stopCooking() |
| 395 | 395 | |
| 396 | 396 | void Oven::startPreheating() |
| 397 | 397 | { |
| 398 | - if (preheatingStartable()) | |
| 399 | - { | |
| 398 | +// if (preheatingStartable()) | |
| 399 | +// { | |
| 400 | 400 | if (cooking()) |
| 401 | 401 | stopCooking(); |
| 402 | 402 | |
| ... | ... | @@ -404,7 +404,7 @@ void Oven::startPreheating() |
| 404 | 404 | interface->startPreheating(); |
| 405 | 405 | |
| 406 | 406 | emit changed(this); |
| 407 | - } | |
| 407 | +// } | |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | void Oven::stopPreheating() |
| ... | ... | @@ -882,7 +882,7 @@ void Oven::onDoorClosed() |
| 882 | 882 | |
| 883 | 883 | emit changed(this); |
| 884 | 884 | |
| 885 | - if (!cooldown() && paused()) | |
| 885 | + if (!cooldown() && !preheating() && paused()) | |
| 886 | 886 | startCooking(); |
| 887 | 887 | |
| 888 | 888 | if (damper()) | ... | ... |
app/gui/oven_control/preheatpopup.cpp
| ... | ... | @@ -28,6 +28,8 @@ PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) : |
| 28 | 28 | ui->preheatGauge->setMinimum(oven->currentTemp()); |
| 29 | 29 | ui->preheatGauge->setValue(oven->currentTemp()); |
| 30 | 30 | |
| 31 | + updateView(); | |
| 32 | + | |
| 31 | 33 | start(); |
| 32 | 34 | } |
| 33 | 35 | |
| ... | ... | @@ -38,7 +40,7 @@ PreheatPopup::~PreheatPopup() |
| 38 | 40 | |
| 39 | 41 | void PreheatPopup::updateView() |
| 40 | 42 | { |
| 41 | - ui->timeLabel->setText(Stringer::remainingTime(oven->time(), Stringer::fontSize14)); | |
| 43 | + ui->timeLabel->setText(Stringer::remainingTime(oven->msecs(), Stringer::fontSize14)); | |
| 42 | 44 | |
| 43 | 45 | int curInterTemp = oven->currentInterTemp(); |
| 44 | 46 | if (oven->interTempEnabled()) | ... | ... |