GUI 업데이트

김태훈
1 parent 0e8971b56c
Showing 10 changed files with 94 additions and 76 deletions Show diff stats
app/gui/oven_control/main.cpp
app/gui/oven_control/mainwindow.cpp
app/gui/oven_control/manualcookwindow.cpp
app/gui/oven_control/manualcookwindow.h
app/gui/oven_control/manualcookwindow.ui
app/gui/oven_control/oven.cpp
app/gui/oven_control/oven.h
app/gui/oven_control/oven_control.pro
app/gui/oven_control/ovencontroller.cpp
app/gui/oven_control/ovencontroller.h
@@ -7,7 +7,7 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-
+    a.primaryScreen().
     MainWindow w;
     w.showFullScreen();
@@ -26,6 +26,7 @@ MainWindow::MainWindow(QWidget *parent) :
     interface->setUdpHandler(udp);
     ManualCookWindow *window = new ManualCookWindow(this, oven, udp);
+    window->setWindowModality(Qt::WindowModal);
     window->hide();
     connect(ui->steamButton, SIGNAL(clicked()), this, SIGNAL(modeButtonClicked()));
@@ -43,8 +44,6 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->combiButton, SIGNAL(clicked()), sm, SLOT(map()));
     connect(ui->dryheatButton, SIGNAL(clicked()), sm, SLOT(map()));
     connect(sm, SIGNAL(mapped(int)), this, SLOT(onModeButtonClicked(int)));
-
-
 }
 MainWindow::~MainWindow()
@@ -54,7 +53,6 @@ MainWindow::~MainWindow()
 void MainWindow::onModeButtonClicked(int mode)
 {
-//    oven->setMode((Oven::Mode) mode);
     oven->setDefault((Oven::Mode) mode);
 }
@@ -65,5 +63,6 @@ void MainWindow::on_configButton_clicked()
 //    w->showFullScreen();
     FunctionTestWindow *w = new FunctionTestWindow(this, udp);
+    w->setWindowModality(Qt::WindowModal);
     w->showFullScreen();
 }
@@ -156,7 +156,12 @@ void ManualCookWindow::updateLabels()
     else
         time = oven->time();
-    ui->timeLabel->setText(buf.sprintf("%02d:%02d H/M", time / 3600, (time % 3600) / 60));
+    if (time >= 3600)
+        ui->timeLabel->setText(buf.sprintf("%d시간 %02d분", time / 3600, (time % 3600) / 60));
+    else if (time >= 60)
+        ui->timeLabel->setText(buf.sprintf("%d분 %02d초", time / 60, time % 60));
+    else
+        ui->timeLabel->setText(buf.sprintf("%d초", time));
     if (oven->interTempEnabled())
     {
@@ -268,7 +273,40 @@ QPushButton#interTempButton:pressed {\
     ui->innerInterTempSlider->setValue(oven->interTemp());
     ui->innerInterTempSlider->blockSignals(old);
-    ui->runStopButton->setChecked(oven->cooking());
+    if (oven->cooking())
+        ui->runStopButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/012_play_btn_ov_stop.png)");
+    else
+        ui->runStopButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/012_play_btn.png)");
+
+    if (oven->preheating())
+        ui->preheatButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_01_ov.png)");
+    else
+        ui->preheatButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_01.png)");
+
+    if (oven->damper())
+        ui->damperButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_02_ov.png)");
+    else
+        ui->damperButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_02.png)");
+
+    if (oven->humidification())
+        ui->humidificationButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_03_ov.png)");
+    else
+        ui->humidificationButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_03.png)");
+
+    if (oven->cooldown())
+        ui->cooldownButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_05_ov.png)");
+    else
+        ui->cooldownButton->setStyleSheet(
+                    "border-image: url(:/images/images/manual/013_sys_icon_05.png)");
     switch (oven->fan())
     {
@@ -301,15 +339,15 @@ QPushButton#interTempButton:pressed {\
     updateLabels();
 }
-void ManualCookWindow::on_runStopButton_toggled(bool checked)
+void ManualCookWindow::on_runStopButton_clicked()
 {
-    if (checked)
-        oven->startCooking();
-    else
+    if (oven->cooking())
     {
         oven->stopCooking();
         emit cookStopRequested();
     }
+    else
+        oven->startCooking();
 }
 void ManualCookWindow::on_fanButton_clicked()
@@ -331,10 +369,7 @@ void ManualCookWindow::on_applyButton_clicked()
     ui->bodyStack->setCurrentIndex(0);
     oven->setInterTemp(ui->innerInterTempSlider->value());
-//    bool old = oven->blockSignals(true);
     oven->setInterTempEnabled(true);
-//    oven->blockSignals(old);
-
 }
 void ManualCookWindow::on_interTempButton_clicked()
@@ -347,84 +382,47 @@ void ManualCookWindow::on_interTempButton_clicked()
 void ManualCookWindow::on_preheatButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_DV);
+    if (oven->preheating())
+        oven->stopPreheating();
     else
-        udp->turnOff(TG_DV);
-
-    sw = !sw;
+        oven->startPreheating();
 }
 void ManualCookWindow::on_damperButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_UNP);
+    if (oven->damper())
+        oven->closeDamper();
     else
-        udp->turnOff(TG_UNP);
-
-    sw = !sw;
+        oven->openDamper();
 }
 void ManualCookWindow::on_humidificationButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_HDM);
+    if (oven->humidification())
+        oven->stopHumidification();
     else
-        udp->turnOff(TG_HDM);
-
-    sw = !sw;
+        oven->startHumidification();
 }
 void ManualCookWindow::on_repeatButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_SSV);
-    else
-        udp->turnOff(TG_SSV);
-    sw = !sw;
 }
 void ManualCookWindow::on_cooldownButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_SNV);
+    if (oven->cooldown())
+        oven->stopCooldown();
     else
-        udp->turnOff(TG_SNV);
-
-    sw = !sw;
+        oven->startCooldown();
 }
 void ManualCookWindow::on_reserveButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_HL);
-    else
-        udp->turnOff(TG_HL);
-    sw = !sw;
 }
 void ManualCookWindow::on_favoritesButton_clicked()
 {
-    static bool sw = false;
-    udp->turnOn(TG_MANUAL_RELAY);
-    if (sw)
-        udp->turnOn(TG_DP);
-    else
-        udp->turnOff(TG_DP);
-    sw = !sw;
 }
@@ -34,7 +34,7 @@ private slots:
     void showCurrentTemp();
     void hideCurrentTemp();
-    void on_runStopButton_toggled(bool checked);
+    void on_runStopButton_clicked();
     void on_fanButton_clicked();
     void on_goOuterButton_clicked();
     void on_applyButton_clicked();
@@ -469,18 +469,11 @@ background-image: url(:/images/images/manual/010_gauge_bar_set.png);
       <property name="styleSheet">
        <string notr="true">QPushButton {
 	border-image: url(:/images/images/manual/012_play_btn.png);
-}
-
-QPushButton:checked {
-	border-image: url(:/images/images/manual/012_play_btn_ov_stop.png);
 }</string>
       </property>
       <property name="text">
        <string/>
       </property>
-      <property name="checkable">
-       <bool>true</bool>
-      </property>
      </widget>
      <widget class="QSlider" name="interTempSlider">
       <property name="enabled">
@@ -10,6 +10,9 @@ Oven::Oven(QObject *parent) : QObject(parent)
     cookingTimer.setSingleShot(true);
     connect(&cookingTimer, SIGNAL(timeout()), this, SLOT(stopCooking()));
+    damperTimer.setSingleShot(true);
+    connect(&damperTimer, SIGNAL(timeout()), this, SLOT(closeDamper()));
+
     humidificationTimer.setSingleShot(true);
     connect(&humidificationTimer, SIGNAL(timeout()), this, SLOT(stopHumidification()));
 }
@@ -72,6 +75,7 @@ void Oven::setDefault(Mode mode)
     setTime(0);
     setInterTempEnabled_(false);
+    setInterTemp_(minInterTemp());
     setFan_(4);
     cooking_ = false;
@@ -202,7 +206,7 @@ bool Oven::setFan_(int speed)
     if (speed == fan_)
         return false;
-    int rpm;
+    int rpm = 0;
     switch (speed)
     {
     case 1:
@@ -230,7 +234,7 @@ bool Oven::setFan_(int speed)
 bool Oven::cookingStartable()
 {
-    if (/*door() || */cooking())
+    if (/*door() || */cooking() || time() <= 0)
         return false;
     return true;
@@ -267,6 +271,9 @@ void Oven::stop()
     if (preheating())
         stopPreheating();
+    if (damper())
+        closeDamper();
+
     if (cooldown())
         stopCooldown();
@@ -405,12 +412,28 @@ void Oven::stopWashing()
 void Oven::openDamper()
 {
+    if (!damper())
+    {
+        damper_ = true;
+        damperTimer.start(5 * 60 * 1000);
+        interface->openDamper();
+        emit changed(this);
+    }
 }
 void Oven::closeDamper()
 {
+    if (damper())
+    {
+        damper_ = false;
+        if (damperTimer.isActive())
+            damperTimer.stop();
+
+        interface->closeDamper();
+        emit changed(this);
+    }
 }
@@ -9,6 +9,7 @@ class OvenInterface : public QObject
     Q_OBJECT
 public:
+    OvenInterface(QObject *parent = 0) : QObject(parent) {}
     virtual ~OvenInterface(){}
     virtual int currentTemp() = 0;
     virtual int currentHumidity() = 0;
@@ -16,8 +17,8 @@ public:
     virtual bool door() = 0;
 signals:
-    virtual void doorOpened() = 0;
-    virtual void doorClosed() = 0;
+    void doorOpened();
+    void doorClosed();
 public slots:
 //    virtual void setMode(Oven::Mode mode) = 0;
@@ -70,6 +71,7 @@ private:
     bool paused_;
     QTimer cookingTimer;
+    QTimer damperTimer;
     QTimer humidificationTimer;
     QTimer interTempTimer;
@@ -65,3 +65,6 @@ FORMS    += mainwindow.ui \
 RESOURCES += \
     resources.qrc
+
+target.path = /root
+INSTALLS += target
 #include "ovencontroller.h"
-OvenController::OvenController()
+OvenController::OvenController(QObject *parent) : OvenInterface(parent)
 {
 }
@@ -14,7 +14,7 @@ class OvenController : public OvenInterface
     oven_state_t state;
 public:
-    OvenController();
+    OvenController(QObject *parent = 0);
     void setUdpHandler(UdpHandler *udp);
     int currentTemp();
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	int main(int argc, char *argv[])	7	int main(int argc, char *argv[])
8	{	8	{
9	QApplication a(argc, argv);	9	QApplication a(argc, argv);
10	-	10	+ a.primaryScreen().
11	MainWindow w;	11	MainWindow w;
12	w.showFullScreen();	12	w.showFullScreen();
13		13
	@@ -34,7 +34,7 @@ private slots:		@@ -34,7 +34,7 @@ private slots:
34	void showCurrentTemp();	34	void showCurrentTemp();
35	void hideCurrentTemp();	35	void hideCurrentTemp();
36		36
37	- void on_runStopButton_toggled(bool checked);	37	+ void on_runStopButton_clicked();
38	void on_fanButton_clicked();	38	void on_fanButton_clicked();
39	void on_goOuterButton_clicked();	39	void on_goOuterButton_clicked();
40	void on_applyButton_clicked();	40	void on_applyButton_clicked();
	@@ -65,3 +65,6 @@ FORMS += mainwindow.ui \		@@ -65,3 +65,6 @@ FORMS += mainwindow.ui \
65		65
66	RESOURCES += \	66	RESOURCES += \
67	resources.qrc	67	resources.qrc
		68	+
		69	+target.path = /root
		70	+INSTALLS += target
1	#include "ovencontroller.h"	1	#include "ovencontroller.h"
2		2
3	-OvenController::OvenController()	3	+OvenController::OvenController(QObject *parent) : OvenInterface(parent)
4	{	4	{
5		5
6	}	6	}
	@@ -14,7 +14,7 @@ class OvenController : public OvenInterface		@@ -14,7 +14,7 @@ class OvenController : public OvenInterface
14	oven_state_t state;	14	oven_state_t state;
15		15
16	public:	16	public:
17	- OvenController();	17	+ OvenController(QObject *parent = 0);
18		18
19	void setUdpHandler(UdpHandler *udp);	19	void setUdpHandler(UdpHandler *udp);
20	int currentTemp();	20	int currentTemp();