수동 요리 기능 추가

- 요리 완료 시 문 열림 애니메이션 표출 - 문 열면 애니메이션을 숨기고 시계 표출

수동 요리 기능 추가
- 요리 완료 시 문 열림 애니메이션 표출 - 문 열면 애니메이션을 숨기고 시계 표출
김태훈
1 parent 0c0962857e
Showing 3 changed files with 73 additions and 14 deletions Show diff stats
app/gui/oven_control/manualcookwindow.cpp
app/gui/oven_control/manualcookwindow.h
app/gui/oven_control/manualcookwindow.ui
@@ -240,15 +240,26 @@ void ManualCookWindow::keyReleaseEvent(QKeyEvent *event)
 void ManualCookWindow::setupAnimation()
 {
-    ui->openDoorAnimation->load(":/images/animation/door_big_09.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_08.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_07.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_06.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_05.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_04.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_03.png");
-    ui->openDoorAnimation->load(":/images/animation/door_big_02.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_09.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_08.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_07.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_06.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_05.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_04.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_03.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_02.png");
+    ui->closeDoorAnimation->load(":/images/animation/door_big_01.png");
+    ui->closeDoorAnimation->start(300);
+
     ui->openDoorAnimation->load(":/images/animation/door_big_01.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_02.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_03.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_04.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_05.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_06.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_07.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_08.png");
+    ui->openDoorAnimation->load(":/images/animation/door_big_09.png");
     ui->openDoorAnimation->start(300);
 }
@@ -475,10 +486,20 @@ QPushButton:focus { background-image: url(%2); }&quot;);
     ui->repeatButton->setChecked(repeat);
-    if (oven->paused() && !oven->cooldown() && oven->door())
-        ui->upperStack->setCurrentIndex(1);
+    if (done)
+    {
+        if (oven->door())
+            ui->upperStack->setCurrentIndex(0); // Clock
+        else
+            ui->upperStack->setCurrentIndex(2); // Open Door
+    }
     else
-        ui->upperStack->setCurrentIndex(0);
+    {
+        if (oven->paused() && !oven->cooldown() && oven->door())
+            ui->upperStack->setCurrentIndex(1); // Close Door
+        else
+            ui->upperStack->setCurrentIndex(0); // Clock
+    }
 }
 void ManualCookWindow::showCurrentHumidity()
@@ -510,7 +531,10 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
     updateView();
     if (oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp())
+    {
+        done = true;
         stop();
+    }
     if (repeat && !oven->cooking())
     {
@@ -530,10 +554,13 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
                 || oven->time() == 0)
         {
             lastCheckedCooking = oven->cooking();
-            emit done();
+            done = true;
         }
     }
+    if (done && oven->door())
+        done = false;
+
     lastCheckedCooking = oven->cooking();
     if (oven->paused() && oven->door())
@@ -568,6 +595,8 @@ void ManualCookWindow::start()
     if (oven->time() > 0)
     {
+        done = false;
+
         SoundPlayer::playStart();
         if (startCookingTimer.isActive())
@@ -27,7 +27,6 @@ protected:
 signals:
     void cookStopRequested();
-    void done();
 public slots:
@@ -135,6 +134,7 @@ private:
     QTimer monitor3;
     bool monitorTriggered;
+    bool done;
     ManualCookSetting repeatSetting;
     bool repeat;
@@ -136,7 +136,7 @@ height: 33px;
      <property name="styleSheet">
       <string notr="true">#closeDoorWidget { background-image: url(:/images/clock/background.png); }</string>
      </property>
-     <widget class="AnimatedImageBox" name="openDoorAnimation">
+     <widget class="AnimatedImageBox" name="closeDoorAnimation">
       <property name="geometry">
        <rect>
         <x>366</x>
@@ -160,6 +160,36 @@ height: 33px;
       </property>
      </widget>
     </widget>
+    <widget class="QWidget" name="openDoorWidget">
+     <property name="styleSheet">
+      <string notr="true">#openDoorWidget { background-image: url(:/images/clock/background.png); }</string>
+     </property>
+     <widget class="QLabel" name="label_7">
+      <property name="geometry">
+       <rect>
+        <x>430</x>
+        <y>170</y>
+        <width>85</width>
+        <height>24</height>
+       </rect>
+      </property>
+      <property name="pixmap">
+       <pixmap resource="resources.qrc">:/images/animation/open_door_arrow.png</pixmap>
+      </property>
+     </widget>
+     <widget class="AnimatedImageBox" name="openDoorAnimation">
+      <property name="geometry">
+       <rect>
+        <x>366</x>
+        <y>20</y>
+        <width>251</width>
+        <height>292</height>
+       </rect>
+      </property>
+     </widget>
+     <zorder>openDoorAnimation</zorder>
+     <zorder>label_7</zorder>
+    </widget>
    </widget>
    <widget class="QPushButton" name="combiButton">
     <property name="geometry">
	@@ -136,7 +136,7 @@ height: 33px;		@@ -136,7 +136,7 @@ height: 33px;
136	<property name="styleSheet">	136	<property name="styleSheet">
137	<string notr="true">#closeDoorWidget { background-image: url(:/images/clock/background.png); }</string>	137	<string notr="true">#closeDoorWidget { background-image: url(:/images/clock/background.png); }</string>
138	</property>	138	</property>
139	- <widget class="AnimatedImageBox" name="openDoorAnimation">	139	+ <widget class="AnimatedImageBox" name="closeDoorAnimation">
140	<property name="geometry">	140	<property name="geometry">
141	<rect>	141	<rect>
142	<x>366</x>	142	<x>366</x>
	@@ -160,6 +160,36 @@ height: 33px;		@@ -160,6 +160,36 @@ height: 33px;
160	</property>	160	</property>
161	</widget>	161	</widget>
162	</widget>	162	</widget>
		163	+ <widget class="QWidget" name="openDoorWidget">
		164	+ <property name="styleSheet">
		165	+ <string notr="true">#openDoorWidget { background-image: url(:/images/clock/background.png); }</string>
		166	+ </property>
		167	+ <widget class="QLabel" name="label_7">
		168	+ <property name="geometry">
		169	+ <rect>
		170	+ <x>430</x>
		171	+ <y>170</y>
		172	+ <width>85</width>
		173	+ <height>24</height>
		174	+ </rect>
		175	+ </property>
		176	+ <property name="pixmap">
		177	+ <pixmap resource="resources.qrc">:/images/animation/open_door_arrow.png</pixmap>
		178	+ </property>
		179	+ </widget>
		180	+ <widget class="AnimatedImageBox" name="openDoorAnimation">
		181	+ <property name="geometry">
		182	+ <rect>
		183	+ <x>366</x>
		184	+ <y>20</y>
		185	+ <width>251</width>
		186	+ <height>292</height>
		187	+ </rect>
		188	+ </property>
		189	+ </widget>
		190	+ <zorder>openDoorAnimation</zorder>
		191	+ <zorder>label_7</zorder>
		192	+ </widget>
163	</widget>	193	</widget>
164	<widget class="QPushButton" name="combiButton">	194	<widget class="QPushButton" name="combiButton">
165	<property name="geometry">	195	<property name="geometry">