청결/관리 상태 기능 반영

김태훈
1 parent f4f894f09b
Showing 4 changed files with 28 additions and 4 deletions Show diff stats
app/gui/oven_control/oven.cpp
app/gui/oven_control/washwindow.cpp
app/gui/oven_control/washwindow.h
app/gui/oven_control/washwindow.ui
@@ -5,6 +5,7 @@
 #include <cmath>
 #include "soundplayer.h"
+#include "dirtylevel.h"
 Oven *Oven::instance = 0;
@@ -358,6 +359,8 @@ void Oven::startCooking()
             cooking_ = true;
             cookingTimer.start();
             interface->startCooking();
+
+            DirtyLevel::cookStart();
         }
         emit changed(this);
@@ -384,6 +387,8 @@ void Oven::stopCooking()
         cooking_ = false;
         interface->stopCooking();
+        DirtyLevel::cookEnd();
+
         emit changed(this);
     }
 }
@@ -4,6 +4,7 @@
 #include <QSignalMapper>
 #include "soundplayer.h"
+#include "dirtylevel.h"
 WashWindow::WashWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -48,6 +49,8 @@ WashWindow::WashWindow(QWidget *parent) :
     foreach (QPushButton *button, findChildren<QPushButton *>())
         connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+
+    updateGauge();
 }
 WashWindow::~WashWindow()
@@ -97,6 +100,12 @@ void WashWindow::returnToClock()
     ui->upperStack->setCurrentIndex(0);
 }
+void WashWindow::updateGauge()
+{
+    ui->dirtySlider->setValue(DirtyLevel::dirty());
+    ui->stateSlider->setValue(DirtyLevel::state());
+}
+
 void WashWindow::onChanged()
 {
     if (!selected)
@@ -213,6 +222,7 @@ void WashWindow::onChanged()
     else if (run)
     {
         SoundPlayer::playStop();
+        DirtyLevel::wash(type);
         ui->titleLabel->setText("세척이 종료되었습니다");
         ui->descLabel->setText("");
@@ -229,6 +239,8 @@ void WashWindow::onChanged()
         opened = false;
         started = false;
         run = false;
+
+        updateGauge();
     }
 }
@@ -22,6 +22,7 @@ private slots:
     void start(int type);
     void stop();
     void returnToClock();
+    void updateGauge();
     void onChanged();
     void on_backButton_clicked();
@@ -851,7 +851,10 @@ QPushButton:pressed { image: url(:/images/slider_icon/management_ov.png); }&lt;/str
      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
     </property>
    </widget>
-   <widget class="QSlider" name="configSlider_4">
+   <widget class="QSlider" name="stateSlider">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>185</x>
@@ -861,7 +864,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/management_ov.png); }&lt;/str
      </rect>
     </property>
     <property name="maximum">
-     <number>100</number>
+     <number>5</number>
     </property>
     <property name="pageStep">
      <number>1</number>
@@ -1087,7 +1090,10 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
     </property>
    </widget>
-   <widget class="QSlider" name="configSlider_5">
+   <widget class="QSlider" name="dirtySlider">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>185</x>
@@ -1097,7 +1103,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
      </rect>
     </property>
     <property name="maximum">
-     <number>100</number>
+     <number>5</number>
     </property>
     <property name="pageStep">
      <number>1</number>
	@@ -22,6 +22,7 @@ private slots:		@@ -22,6 +22,7 @@ private slots:
22	void start(int type);	22	void start(int type);
23	void stop();	23	void stop();
24	void returnToClock();	24	void returnToClock();
		25	+ void updateGauge();
25	void onChanged();	26	void onChanged();
26	void on_backButton_clicked();	27	void on_backButton_clicked();
27		28