버그 수정 및 코드 정리

- 버튼 로직 정리 - 요리 시간 바를 클릭하면 버튼 클릭으로 연결 - 쓰임에 따라 변수 분리 - 요리를 시작하지 않아도 요리 시간 조절 중에 요리 시간이 흘러가는 문제 수정

버그 수정 및 코드 정리
- 버튼 로직 정리 - 요리 시간 바를 클릭하면 버튼 클릭으로 연결 - 쓰임에 따라 변수 분리 - 요리를 시작하지 않아도 요리 시간 조절 중에 요리 시간이 흘러가는 문제 수정
김태훈 · 고영탁
1 parent 703beed2b8
Showing 3 changed files with 50 additions and 39 deletions Show diff stats
app/gui/oven_control/multiautocook.cpp
app/gui/oven_control/multicookwindow.cpp
app/gui/oven_control/multicookwindow.h
@@ -206,6 +206,9 @@ void MultiAutoCook::append(int temperature, int humidity, int time)
 void MultiAutoCook::updateTime()
 {
+    if (state != Running)
+        return;
+
     int e = elapsed.restart();
     while (steps.size() > 0)
@@ -28,6 +28,8 @@ MultiCookWindow::MultiCookWindow(QWidget *parent) :
     ui->view->setContainer(container);
     ui->view->setTimeBar(ui->bar);
+    connect(ui->view, SIGNAL(clicked(int)), SLOT(handleViewClick(int)));
+
     buttons.append(ui->selectButton_1);
     buttons.append(ui->selectButton_2);
@@ -49,7 +51,8 @@ MultiCookWindow::MultiCookWindow(QWidget *parent) :
     mode = Define::InvalidMode;
-    lastClickedButton = -1;
+    lastClickedEmptyButton = -1;
+    lastClickedCookButton = -1;
     lastClickedRecentCook = -1;
     trashClicked = false;
@@ -193,19 +196,19 @@ void MultiCookWindow::updateView()
 void MultiCookWindow::updateRecents()
 {
-    if (favorites.size() > 0)
+    if (recents.size() > 0)
     {
-        if (favorites.size() > 6)
+        if (recents.size() > 6)
         {
             int currentPage = ui->pageIndicator->currentIndex();
             int from = currentPage * 6;
-            int to = qMin(6, favorites.size() - from) + from;
+            int to = qMin(6, recents.size() - from) + from;
             for (int i = from; i < to; i++)
             {
                 QPushButton *b = recentButtons.at(i - from);
                 b->show();
-                b->setText(favorites.at(i)->name());
+                b->setText(recents.at(i)->name());
             }
             for (int i = to - from; i < 6; i++)
@@ -217,12 +220,12 @@ void MultiCookWindow::updateRecents()
         }
         else
         {
-            int max = qMin(6, favorites.size());
+            int max = qMin(6, recents.size());
             for (int i = 0; i < max; i++)
             {
                 QPushButton *b = recentButtons.at(i);
                 b->show();
-                b->setText(favorites.at(i)->name());
+                b->setText(recents.at(i)->name());
             }
             for (int i = max; i < 6; i++)
@@ -244,13 +247,22 @@ void MultiCookWindow::updateRecents()
     }
 }
+void MultiCookWindow::handleViewClick(int slot)
+{
+    buttons.at(slot)->setFocus();
+
+    handleButtonClick(slot);
+}
+
 void MultiCookWindow::handleButtonClick(int button)
 {
-    if (lastClickedButton != -1)
+    if (lastClickedCookButton != -1)
     {
-        MultiCook *cook = container->at(lastClickedButton);
+        MultiCook *cook = container->at(lastClickedCookButton);
         if (cook)
             cook->setTime();
+
+        lastClickedCookButton = -1;
     }
     MultiCook *cook = container->at(button);
@@ -263,22 +275,19 @@ void MultiCookWindow::handleButtonClick(int button)
             cook->deleteLater();
         }
         else
-        {
-            lastClickedButton = button;
-        }
+            lastClickedCookButton = button;
     }
     else
     {
         if (lastClickedRecentCook != -1)
         {
-            MultiCook *c = favorites.at(lastClickedRecentCook)->clone(this);
-            addCook(button, c);
+            addCook(button, recents.at(lastClickedRecentCook)->clone(this));
             lastClickedRecentCook = -1;
         }
         else
         {
-            lastClickedButton = button;
+            lastClickedEmptyButton = button;
             ui->upperStack->setCurrentIndex(0);
             setFocus();
@@ -311,19 +320,19 @@ void MultiCookWindow::onCookSelected(MultiCook *cook)
 {
     cook->setParent(this);
-    if (lastClickedButton != -1)
+    if (lastClickedEmptyButton != -1)
     {
-        addCook(lastClickedButton, cook);
-        lastClickedButton = -1;
+        addCook(lastClickedEmptyButton, cook);
+        lastClickedEmptyButton = -1;
     }
 }
 void MultiCookWindow::showRecents()
 {
-    favorites = MultiCookRecorder::list();
+    recents = MultiCookRecorder::list();
     ui->upperStack->setCurrentIndex(1);
-    ui->pageIndicator->setMaximum(favorites.size() / 6);
+    ui->pageIndicator->setMaximum(recents.size() / 6);
     ui->pageIndicator->setCurrentIndex(0);
     updateRecents();
@@ -443,12 +452,8 @@ void MultiCookWindow::onEncoderLeft()
 {
     MultiCook *c = Q_NULLPTR;
-    if (lastClickedButton != -1)
-    {
-        QPushButton *b = buttons.at(lastClickedButton);
-        if (b == focusWidget())
-            c = container->at(lastClickedButton);
-    }
+    if (lastClickedCookButton != -1)
+        c = container->at(lastClickedCookButton);
     if (c)
         c->decreaseTime();
@@ -460,12 +465,8 @@ void MultiCookWindow::onEncoderRight()
 {
     MultiCook *c = Q_NULLPTR;
-    if (lastClickedButton != -1)
-    {
-        QPushButton *b = buttons.at(lastClickedButton);
-        if (b == focusWidget())
-            c = container->at(lastClickedButton);
-    }
+    if (lastClickedCookButton != -1)
+        c = container->at(lastClickedCookButton);
     if (c)
         c->increaseTime();
@@ -477,13 +478,11 @@ void MultiCookWindow::onEncoderClicked(QWidget *clicked)
 {
     MultiCook *c = Q_NULLPTR;
-    if (lastClickedButton != -1)
+    if (lastClickedCookButton != -1)
     {
-        QPushButton *b = buttons.at(lastClickedButton);
-        if (b == focusWidget())
-            c = container->at(lastClickedButton);
+        c = container->at(lastClickedCookButton);
-        lastClickedButton = -1;
+        lastClickedCookButton = -1;
     }
     if (c)
@@ -587,3 +586,8 @@ void MultiCookWindow::on_showNextPageButton_clicked()
     ui->pageIndicator->setCurrentIndex(ui->pageIndicator->currentIndex() + 1);
     updateView();
 }
+
+void MultiCookWindow::on_homeButton_clicked()
+{
+    close();
+}
@@ -26,6 +26,7 @@ protected:
 private slots:
     void updateView();
     void updateRecents();
+    void handleViewClick(int slot);
     void handleButtonClick(int button);
     void handleRecentButtonClick(int button);
     void selectCook();
@@ -72,6 +73,8 @@ private slots:
     void on_showPrevPageButton_clicked();
     void on_showNextPageButton_clicked();
+    void on_homeButton_clicked();
+
 private:
     Ui::MultiCookWindow *ui;
@@ -80,10 +83,11 @@ private:
     QList<QPushButton *> buttons;
     QList<QPushButton *> recentButtons;
-    QList<MultiCook *> favorites;
+    QList<MultiCook *> recents;
     QTimer updateViewTimer;
-    int lastClickedButton;
+    int lastClickedEmptyButton;
+    int lastClickedCookButton;
     int lastClickedRecentCook;
     bool trashClicked;