바삭함 주기 중 문 열림/닫힘 애니메이션 및 후속 과정 선택 화면 감춤

김태훈
1 parent 663943a375
Showing 1 changed file with 29 additions and 2 deletions Show diff stats
app/gui/oven_control/autocookwindow.cpp
@@ -220,7 +220,32 @@ void AutoCookWindow::updateView()
  
     if (autocook.done())
     {
-        if (!oven->door())
+        if (processSelected)
+        {
+            if (ui->openDoorAnimation->isVisible())
+                ui->openDoorAnimation->hide();
+
+            if (ui->openDoorArrow->isVisible())
+                ui->openDoorArrow->hide();
+
+            if (oven->door())
+            {
+                if (ui->closeDoorAnimation->isVisible())
+                    ui->closeDoorAnimation->hide();
+
+                if (ui->closeDoorArrow->isVisible())
+                    ui->closeDoorArrow->hide();
+            }
+            else
+            {
+                if (ui->closeDoorAnimation->isVisible())
+                    ui->closeDoorAnimation->hide();
+
+                if (ui->closeDoorArrow->isVisible())
+                    ui->closeDoorArrow->hide();
+            }
+        }
+        else if (!oven->door())
         {
             if (ui->openDoorAnimation->isHidden())
                 ui->openDoorAnimation->show();
@@ -249,7 +274,9 @@ void AutoCookWindow::updateView()
                 ui->closeDoorArrow->hide();
         }
  
-        if (ui->processContainer->isHidden())
+        if (processSelected)
+            ui->processContainer->hide();
+        else if (ui->processContainer->isHidden())
             ui->processContainer->show();
     }
     else if (autocook.isWaitingDoorOpened() && !oven->door())
...	...	@@ -220,7 +220,32 @@ void AutoCookWindow::updateView()
220	220
221	221	if (autocook.done())
222	222	{
223		- if (!oven->door())
	223	+ if (processSelected)
	224	+ {
	225	+ if (ui->openDoorAnimation->isVisible())
	226	+ ui->openDoorAnimation->hide();
	227	+
	228	+ if (ui->openDoorArrow->isVisible())
	229	+ ui->openDoorArrow->hide();
	230	+
	231	+ if (oven->door())
	232	+ {
	233	+ if (ui->closeDoorAnimation->isVisible())
	234	+ ui->closeDoorAnimation->hide();
	235	+
	236	+ if (ui->closeDoorArrow->isVisible())
	237	+ ui->closeDoorArrow->hide();
	238	+ }
	239	+ else
	240	+ {
	241	+ if (ui->closeDoorAnimation->isVisible())
	242	+ ui->closeDoorAnimation->hide();
	243	+
	244	+ if (ui->closeDoorArrow->isVisible())
	245	+ ui->closeDoorArrow->hide();
	246	+ }
	247	+ }
	248	+ else if (!oven->door())
224	249	{
225	250	if (ui->openDoorAnimation->isHidden())
226	251	ui->openDoorAnimation->show();
...	...	@@ -249,7 +274,9 @@ void AutoCookWindow::updateView()
249	274	ui->closeDoorArrow->hide();
250	275	}
251	276
252		- if (ui->processContainer->isHidden())
	277	+ if (processSelected)
	278	+ ui->processContainer->hide();
	279	+ else if (ui->processContainer->isHidden())
253	280	ui->processContainer->show();
254	281	}
255	282	else if (autocook.isWaitingDoorOpened() && !oven->door())
...	...