Commit b13e23ee416cf9e273e7eaef57859fbd6ad99660

Authored by 김태훈
1 parent ea85b35021
Exists in master and in 2 other branches fhd, fhd-demo

자동 요리 수정

- 요리 시작 시 이미 첫 번째 단계 목표가 충족되어 다음 단계로 넘어갔을 때 화면에 반영되지 않는 문제 수정
Showing 1 changed file with 12 additions and 4 deletions   Show diff stats
app/gui/oven_control/autocookwindow.cpp
@@ -320,6 +320,14 @@ void AutoCookWindow::updateView() @@ -320,6 +320,14 @@ void AutoCookWindow::updateView()
320 ui->preheatGauge->hide(); 320 ui->preheatGauge->hide();
321 } 321 }
322 322
  323 + if (selectedStepIndex != autocook.currentStepIndex)
  324 + {
  325 + if (!returnToCurrentStepTimer.isActive())
  326 + {
  327 + selectedStepIndex = autocook.currentStepIndex;
  328 + }
  329 + }
  330 +
323 if (selectedStepIndex != lastViewStepIndex) 331 if (selectedStepIndex != lastViewStepIndex)
324 { 332 {
325 lastViewStepIndex = selectedStepIndex; 333 lastViewStepIndex = selectedStepIndex;
@@ -667,22 +675,22 @@ void AutoCookWindow::on_backButton_clicked() @@ -667,22 +675,22 @@ void AutoCookWindow::on_backButton_clicked()
667 675
668 void AutoCookWindow::on_showPrevStepButton_clicked() 676 void AutoCookWindow::on_showPrevStepButton_clicked()
669 { 677 {
  678 + returnToCurrentStepTimer.start();
  679 +
670 if (selectedStepIndex > 0) 680 if (selectedStepIndex > 0)
671 { 681 {
672 selectedStepIndex--; 682 selectedStepIndex--;
673 updateView(); 683 updateView();
674 } 684 }
675 -  
676 - returnToCurrentStepTimer.start();  
677 } 685 }
678 686
679 void AutoCookWindow::on_showNextStepButton_clicked() 687 void AutoCookWindow::on_showNextStepButton_clicked()
680 { 688 {
  689 + returnToCurrentStepTimer.start();
  690 +
681 if (selectedStepIndex + 1 < autocook.cook.steps.size()) 691 if (selectedStepIndex + 1 < autocook.cook.steps.size())
682 { 692 {
683 selectedStepIndex++; 693 selectedStepIndex++;
684 updateView(); 694 updateView();
685 } 695 }
686 -  
687 - returnToCurrentStepTimer.start();  
688 } 696 }