From 36685016587c79bf79564c108534ea6e09f589d0 Mon Sep 17 00:00:00 2001
From: victor <taehoon@falinux.com>
Date: Wed, 22 Mar 2017 19:25:38 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=8B=9C=ED=97=98=20?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gui/oven_control/componenttestwindow.cpp       |   4 +--
 .../images/manual/graphe_BTN_Bigsize.png           | Bin 0 -> 3862 bytes
 app/gui/oven_control/manualcookwindow.ui           |  35 +++++++++------------
 app/gui/oven_control/oven.cpp                      |   8 ++++-
 app/gui/oven_control/ovencontroller.cpp            |   2 +-
 app/gui/oven_control/packetprinter.cpp             |   4 +--
 app/gui/oven_control/resources.qrc                 |   1 +
 7 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 app/gui/oven_control/images/manual/graphe_BTN_Bigsize.png

diff --git a/app/gui/oven_control/componenttestwindow.cpp b/app/gui/oven_control/componenttestwindow.cpp
index 2b1a37c..9fc22e0 100644
--- a/app/gui/oven_control/componenttestwindow.cpp
+++ b/app/gui/oven_control/componenttestwindow.cpp
@@ -32,9 +32,9 @@ void ComponentTestWindow::onDataChanged()
         ui->lampButton->setText("ON");
 
     if (udp->hdm())
-        ui->damperButton->setText("START");
-    else
         ui->damperButton->setText("STOP");
+    else
+        ui->damperButton->setText("START");
 }
 
 void ComponentTestWindow::on_speakerButton_clicked()
diff --git a/app/gui/oven_control/images/manual/graphe_BTN_Bigsize.png b/app/gui/oven_control/images/manual/graphe_BTN_Bigsize.png
new file mode 100644
index 0000000000000000000000000000000000000000..d23fd255e77ff49261b155af0c59ed6fbc667694
GIT binary patch
literal 3862
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
Y07$c{aGUkfkN^Mx07*qoM6N<$f+=V|V*mgE

literal 0
HcmV?d00001

diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui
index aeca067..813e1b4 100644
--- a/app/gui/oven_control/manualcookwindow.ui
+++ b/app/gui/oven_control/manualcookwindow.ui
@@ -433,10 +433,9 @@ margin-bottom: 13px;
 }
 
 QSlider::handle {
-background-image: url(:/images/images/manual/010_gauge_sel.png);
-width: 22px;
-margin-right: -2px;
-margin-top: -2px;
+background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
+width: 23px;
+margin-bottom: -7px;
 }
 
 QSlider {
@@ -503,10 +502,9 @@ margin-bottom: 13px;
 }
 
 QSlider::handle {
-background-image: url(:/images/images/manual/010_gauge_sel.png);
-width: 22px;
-margin-right: -2px;
-margin-top: -2px;
+background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
+width: 23px;
+margin-bottom: -7px;
 }
 
 QSlider {
@@ -559,10 +557,9 @@ margin-bottom: 13px;
 }
 
 QSlider::handle {
-background-image: url(:/images/images/manual/010_gauge_sel.png);
-width: 22px;
-margin-right: -2px;
-margin-top: -2px;
+background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
+width: 23px;
+margin-bottom: -7px;
 }
 
 QSlider {
@@ -653,10 +650,9 @@ margin-bottom: 13px;
 }
 
 QSlider::handle {
-background-image: url(:/images/images/manual/010_gauge_sel.png);
-width: 22px;
-margin-right: -2px;
-margin-top: -2px;
+background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
+width: 23px;
+margin-bottom: -7px;
 }
 
 QSlider {
@@ -1578,10 +1574,9 @@ margin-bottom: 13px;
 }
 
 QSlider::handle {
-background-image: url(:/images/images/manual/010_gauge_sel.png);
-width: 22px;
-margin-right: -2px;
-margin-top: -2px;
+background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png);
+width: 23px;
+margin-bottom: -7px;
 }
 
 QSlider {
diff --git a/app/gui/oven_control/oven.cpp b/app/gui/oven_control/oven.cpp
index 514dda4..8e246ab 100644
--- a/app/gui/oven_control/oven.cpp
+++ b/app/gui/oven_control/oven.cpp
@@ -164,6 +164,11 @@ bool Oven::setInterTempEnabled_(bool enabled)
     if (interTempEnabled_ != enabled)
     {
         interTempEnabled_ = enabled;
+        if (interTempEnabled_)
+            interface->setInterTemp(interTemp_);
+        else
+            interface->setInterTemp(300);
+
         return true;
     }
 
@@ -184,7 +189,8 @@ bool Oven::setInterTemp_(int celsius)
     if (celsius != interTemp_)
     {
         interTemp_ = celsius;
-        interface->setInterTemp(celsius);
+        if (interTempEnabled_)
+            interface->setInterTemp(celsius);
 
         return true;
     }
diff --git a/app/gui/oven_control/ovencontroller.cpp b/app/gui/oven_control/ovencontroller.cpp
index 522f374..45ff8de 100644
--- a/app/gui/oven_control/ovencontroller.cpp
+++ b/app/gui/oven_control/ovencontroller.cpp
@@ -2,7 +2,6 @@
 
 OvenController::OvenController(QObject *parent) : OvenInterface(parent)
 {
-
 }
 
 void OvenController::setUdpHandler(UdpHandler *udp)
@@ -66,6 +65,7 @@ void OvenController::setFan(int rpm)
 void OvenController::startCooking()
 {
     udp->set(TG_OVEN_MODE, 1);
+    udp->set(TG_TIME, 1440);
     udp->turnOn(TG_SYSTEM);
     udp->turnOn(TG_COOKING);
 }
diff --git a/app/gui/oven_control/packetprinter.cpp b/app/gui/oven_control/packetprinter.cpp
index 8f4ea0d..673305c 100644
--- a/app/gui/oven_control/packetprinter.cpp
+++ b/app/gui/oven_control/packetprinter.cpp
@@ -24,7 +24,7 @@ void PacketPrinter::printControl(oven_control_t &control)
 
     stream << "Control\n";
 
-    for (int idx = 0; idx < sizeof(control) / sizeof(unsigned short); idx++)
+    for (int idx = 0; idx < (int) sizeof(control) / sizeof(unsigned short); idx++)
     {
         QString str;
         stream << str.sprintf("0x%04X 0x%04X\n", idx, ((unsigned short *) &control)[idx]);
@@ -40,7 +40,7 @@ void PacketPrinter::printState(oven_state_t &state)
     QTextStream stream(&str);
     stream << "State\n";
 
-    for (int idx = 0; idx < sizeof(state) / sizeof(unsigned short); idx++)
+    for (int idx = 0; idx < (int) sizeof(state) / sizeof(unsigned short); idx++)
     {
         QString str;
         stream << str.sprintf("0x%04X 0x%04X\n", idx, ((unsigned short *) &state)[idx]);
diff --git a/app/gui/oven_control/resources.qrc b/app/gui/oven_control/resources.qrc
index e172fb0..64c8cb9 100644
--- a/app/gui/oven_control/resources.qrc
+++ b/app/gui/oven_control/resources.qrc
@@ -420,5 +420,6 @@
         <file>images/config_service/112_profile_hide_menu_12.png</file>
         <file>images/config_service/112_profile_hide_menu_13.png</file>
         <file>images/config_service/112_profile_hide_menu_14.png</file>
+        <file>images/manual/graphe_BTN_Bigsize.png</file>
     </qresource>
 </RCC>
-- 
2.1.4