done 시그널을 안 쓰는 줄 알았는데, 아니었음. 복원함

김태훈
1 parent f5daa9571a
Showing 2 changed files with 14 additions and 9 deletions Show diff stats
app/gui/oven_control/manualcookwindow.cpp
app/gui/oven_control/manualcookwindow.h
@@ -27,7 +27,8 @@
 ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
     QMainWindow(parent),
     ui(new Ui::ManualCookWindow),
-    repeat(false)
+    repeat(false),
+    cookDone(false)
 {
     ui->setupUi(this);
  
@@ -486,7 +487,7 @@ QPushButton:focus { background-image: url(%2); }&quot;);
  
     ui->repeatButton->setChecked(repeat);
  
-    if (done)
+    if (cookDone)
     {
         if (oven->door())
             ui->upperStack->setCurrentIndex(0); // Clock
@@ -532,7 +533,7 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
  
     if (oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp())
     {
-        done = true;
+        cookDone = true;
         stop();
     }
  
@@ -549,17 +550,20 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
  
         updateView();
     }
-    else if (lastCheckedCooking && !oven->cooking()){
+    else if (lastCheckedCooking && !oven->cooking())
+    {
         if ((oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp())
                 || oven->time() == 0)
         {
             lastCheckedCooking = oven->cooking();
-            done = true;
+            cookDone = true;
+
+            emit done();
         }
     }
  
-    if (done && oven->door())
-        done = false;
+    if (cookDone && oven->door())
+        cookDone = false;
  
     lastCheckedCooking = oven->cooking();
  
@@ -595,7 +599,7 @@ void ManualCookWindow::start()
  
     if (oven->time() > 0)
     {
-        done = false;
+        cookDone = false;
  
         SoundPlayer::playStart();
  
@@ -27,6 +27,7 @@ protected:
  
 signals:
     void cookStopRequested();
+    void done();
  
 public slots:
  
@@ -134,7 +135,7 @@ private:
     QTimer monitor3;
     bool monitorTriggered;
  
-    bool done;
+    bool cookDone;
  
     ManualCookSetting repeatSetting;
     bool repeat;
...	...	@@ -27,7 +27,8 @@
27	27	ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
28	28	QMainWindow(parent),
29	29	ui(new Ui::ManualCookWindow),
30		- repeat(false)
	30	+ repeat(false),
	31	+ cookDone(false)
31	32	{
32	33	ui->setupUi(this);
33	34
...	...	@@ -486,7 +487,7 @@ QPushButton:focus { background-image: url(%2); }");
486	487
487	488	ui->repeatButton->setChecked(repeat);
488	489
489		- if (done)
	490	+ if (cookDone)
490	491	{
491	492	if (oven->door())
492	493	ui->upperStack->setCurrentIndex(0); // Clock
...	...	@@ -532,7 +533,7 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
532	533
533	534	if (oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp())
534	535	{
535		- done = true;
	536	+ cookDone = true;
536	537	stop();
537	538	}
538	539
...	...	@@ -549,17 +550,20 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
549	550
550	551	updateView();
551	552	}
552		- else if (lastCheckedCooking && !oven->cooking()){
	553	+ else if (lastCheckedCooking && !oven->cooking())
	554	+ {
553	555	if ((oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp())
554	556	\|\| oven->time() == 0)
555	557	{
556	558	lastCheckedCooking = oven->cooking();
557		- done = true;
	559	+ cookDone = true;
	560	+
	561	+ emit done();
558	562	}
559	563	}
560	564
561		- if (done && oven->door())
562		- done = false;
	565	+ if (cookDone && oven->door())
	566	+ cookDone = false;
563	567
564	568	lastCheckedCooking = oven->cooking();
565	569
...	...	@@ -595,7 +599,7 @@ void ManualCookWindow::start()
595	599
596	600	if (oven->time() > 0)
597	601	{
598		- done = false;
	602	+ cookDone = false;
599	603
600	604	SoundPlayer::playStart();
601	605
...	...
...	...	@@ -27,6 +27,7 @@ protected:
27	27
28	28	signals:
29	29	void cookStopRequested();
	30	+ void done();
30	31
31	32	public slots:
32	33
...	...	@@ -134,7 +135,7 @@ private:
134	135	QTimer monitor3;
135	136	bool monitorTriggered;
136	137
137		- bool done;
	138	+ bool cookDone;
138	139
139	140	ManualCookSetting repeatSetting;
140	141	bool repeat;
...	...