자동 요리 중 중심 온도 활성화 상태에서 중심 온도계가 빠졌을 경우 대응 기능 추가

김태훈
1 parent 44c81f0cb1
Showing 4 changed files with 65 additions and 0 deletions Show diff stats
app/gui/oven_control/autocook.cpp
app/gui/oven_control/autocook.h
app/gui/oven_control/autocookwindow.cpp
app/gui/oven_control/autocookwindow.ui
@@ -476,6 +476,11 @@ int AutoCook::remainingTime()
     }
 }
  
+bool AutoCook::isCoreTempActivated()
+{
+    return checkingCoreTemp;
+}
+
 int AutoCook::msecs()
 {
     if (done_)
@@ -18,6 +18,7 @@ public:
     int remainingTime();
     bool isWaitingDoorOpened() { return isWaitingDoorOpened_; }
     bool done() { return done_; }
+    bool isCoreTempActivated();
  
     int msecs();
  
@@ -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()
@@ -1360,6 +1360,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
      </rect>
     </property>
    </widget>
+   <widget class="AnimatedImageBox" name="thermometerAnimation">
+    <property name="geometry">
+     <rect>
+      <x>345</x>
+      <y>800</y>
+      <width>210</width>
+      <height>307</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
    <zorder>openDoorAnimation</zorder>
    <zorder>closeDoorAnimation</zorder>
    <zorder>upperStack</zorder>
@@ -1393,6 +1406,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
    <zorder>heatGaugeButton</zorder>
    <zorder>processContainer</zorder>
    <zorder>stepIndicator</zorder>
+   <zorder>thermometerAnimation</zorder>
   </widget>
  </widget>
  <customwidgets>
...	...	@@ -476,6 +476,11 @@ int AutoCook::remainingTime()
476	476	}
477	477	}
478	478
	479	+bool AutoCook::isCoreTempActivated()
	480	+{
	481	+ return checkingCoreTemp;
	482	+}
	483	+
479	484	int AutoCook::msecs()
480	485	{
481	486	if (done_)
...	...
...	...	@@ -18,6 +18,7 @@ public:
18	18	int remainingTime();
19	19	bool isWaitingDoorOpened() { return isWaitingDoorOpened_; }
20	20	bool done() { return done_; }
	21	+ bool isCoreTempActivated();
21	22
22	23	int msecs();
23	24
...	...
...	...	@@ -195,6 +195,11 @@ void AutoCookWindow::setupUi()
195	195	ui->closeDoorAnimation->hide();
196	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	203	lastViewCookMode = Define::InvalidMode;
199	204	lastViewCookType = Define::Invalid;
200	205	lastViewCoreTemp = 999;
...	...	@@ -633,6 +638,46 @@ void AutoCookWindow::updateView()
633	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	683	void AutoCookWindow::checkCook()
...	...
...	...	@@ -1360,6 +1360,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
1360	1360	</rect>
1361	1361	</property>
1362	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	1376	<zorder>openDoorAnimation</zorder>
1364	1377	<zorder>closeDoorAnimation</zorder>
1365	1378	<zorder>upperStack</zorder>
...	...	@@ -1393,6 +1406,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
1393	1406	<zorder>heatGaugeButton</zorder>
1394	1407	<zorder>processContainer</zorder>
1395	1408	<zorder>stepIndicator</zorder>
	1409	+ <zorder>thermometerAnimation</zorder>
1396	1410	</widget>
1397	1411	</widget>
1398	1412	<customwidgets>
...	...