수동 요리 동작 변경

- 요리 중 쿨다운 팝업에 들어가면 요리 중단 후 쿨다운 끝난 뒤 요리 재시작

수동 요리 동작 변경
- 요리 중 쿨다운 팝업에 들어가면 요리 중단 후 쿨다운 끝난 뒤 요리 재시작
김태훈
1 parent 2bc03da304
Showing 2 changed files with 12 additions and 3 deletions Show diff stats
app/gui/oven_control/cooldownpopup.cpp
app/gui/oven_control/cooldownpopup.h
@@ -10,7 +10,8 @@ CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) :
     QWidget(parent),
     ui(new Ui::CooldownPopup),
     oven(oven),
-    showingCurrentTemp(false)
+    showingCurrentTemp(false),
+    needCookStarting(false)
 {
     ui->setupUi(this);
@@ -37,6 +38,9 @@ CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) :
     expectingFanLevel = oven->maxFan();
     started = false;
     opened = false;
+    needCookStarting = oven->cooking();
+    if (needCookStarting)
+        oven->stopCooking();
     connect(oven, SIGNAL(changed(Oven*)), SLOT(updateView()));
@@ -71,6 +75,9 @@ CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) :
 CooldownPopup::~CooldownPopup()
 {
+    if (needCookStarting)
+        oven->startCooking();
+
     delete ui;
 }
@@ -114,6 +121,9 @@ void CooldownPopup::start()
     started = true;
     opened = false;
+    oven->setFan(expectingFanLevel);
+    oven->startCooldown();
+
     checkOvenTimer.start();
     updateView();
@@ -205,8 +215,6 @@ void CooldownPopup::checkOven()
         if (oven->door())
         {
             opened = true;
-            oven->setFan(expectingFanLevel);
-            oven->startCooldown();
         }
     }
     else
@@ -61,6 +61,7 @@ private:
     int expectingFanLevel;
     bool started;
     bool opened;
+    bool needCookStarting;
     int lastDisplayedFanLevel;
     bool lastDisplayedHumidification;
	@@ -61,6 +61,7 @@ private:		@@ -61,6 +61,7 @@ private:
61	int expectingFanLevel;	61	int expectingFanLevel;
62	bool started;	62	bool started;
63	bool opened;	63	bool opened;
		64	+ bool needCookStarting;
64		65
65	int lastDisplayedFanLevel;	66	int lastDisplayedFanLevel;
66	bool lastDisplayedHumidification;	67	bool lastDisplayedHumidification;