V1.5.01

요청 사항 반영 - 실행 알람 시인성 강화

V1.5.01
요청 사항 반영 - 실행 알람 시인성 강화
김태훈
1 parent a128c1aad7
Showing 4 changed files with 61 additions and 34 deletions Show diff stats
app/gui/oven_control/define.h
app/gui/oven_control/manualcookwindow.cpp
app/gui/oven_control/manualcookwindow.h
app/gui/oven_control/manualcookwindow.ui
@@ -5,7 +5,7 @@
 #define MAJOR_VER   1
 #define MINOR_VER   5
-#define HOTFIX_VER  00
+#define HOTFIX_VER  01
 // 0 for normal
 // 1 for premium
@@ -4,6 +4,7 @@
 #include <QSignalMapper>
 #include <QTimer>
 #include <QtDebug>
+#include <QGraphicsDropShadowEffect>
 #include "soundplayer.h"
 #include "preheatpopup.h"
@@ -158,9 +159,14 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
     connect(oven, SIGNAL(changed(Oven*)), this, SLOT(onOvenUpdated(Oven*)));
     oven->setDefault(mode);
+    QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect(this);
+    effect->setBlurRadius(10);
+    effect->setOffset(3, 3);
+
     ui->infoTextLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+    ui->infoTextLabel->setGraphicsEffect(effect);
     ui->infoTextLabel->hide();
-    showInfoTextTimer.setInterval(1500);
+    showInfoTextTimer.setInterval(1000);
     showInfoTextTimer.setSingleShot(true);
     connect(&updateViewTimer, SIGNAL(timeout()), SLOT(updateView()));
@@ -457,9 +463,9 @@ QPushButton:checked\
         ui->damperButton->setChecked(damper);
         if (damper)
-            showInfoText("ON");
+            showInfoText("ON", ":/images/manual_button/damper_open.png");
         else
-            showInfoText("OFF");
+            showInfoText("OFF", ":/images/manual_button/damper_close.png");
     }
     bool humidification = oven->humidification();
@@ -469,9 +475,9 @@ QPushButton:checked\
         qDebug() << "humidification" << humidification;
         if (humidification)
-            showInfoText("ON");
+            showInfoText("ON", ":/images/manual_button/side_nozzle_open.png");
         else
-            showInfoText("OFF");
+            showInfoText("OFF", ":/images/manual_button/side_nozzle_close.png");
     }
     QString fanStyleSheet("\
@@ -523,9 +529,9 @@ QPushButton:focus { background-image: url(%2); }&quot;);
         ui->repeatButton->setChecked(repeat);
         if (repeat)
-            showInfoText("ON");
+            showInfoText("ON", ":/images/manual_button/repeat_ov.png");
         else
-            showInfoText("OFF");
+            showInfoText("OFF", ":/images/manual_button/repeat.png");
     }
     if (cookDone)
@@ -544,22 +550,10 @@ QPushButton:focus { background-image: url(%2); }&quot;);
     }
     int remainingTime = showInfoTextTimer.remainingTime();
-    if (remainingTime > 500)
-    {
-        ui->infoTextLabel->setStyleSheet("color: rgb(255, 255, 255);");
-        ui->infoTextLabel->show();
-    }
-    else if (remainingTime > 0)
-    {
-        ui->infoTextLabel->setStyleSheet(
-                QString("color: rgba(255, 255, 255, %1);")
-                        .arg(qBound(0, remainingTime * 255 / 500, 255)));
+    if (remainingTime > 0)
         ui->infoTextLabel->show();
-    }
     else
-    {
         ui->infoTextLabel->hide();
-    }
 }
 void ManualCookWindow::showCurrentHumidity()
@@ -586,9 +580,14 @@ void ManualCookWindow::hideCurrentTemp()
     updateView();
 }
-void ManualCookWindow::showInfoText(QString text)
+void ManualCookWindow::showInfoText(QString text, QString icon)
 {
-    ui->infoTextLabel->setText(text);
+
+    QString textTemplate = QString(
+                "<img src=\"%2\" />"
+                "<span> %1</span>").arg(text).arg(icon);
+
+    ui->infoTextLabel->setText(textTemplate);
     showInfoTextTimer.start();
 }
@@ -1036,7 +1035,30 @@ void ManualCookWindow::on_fanButton_clicked()
     oven->setFan(fan);
-    showInfoText(QString("%1").arg(fan));
+    QString text = QString("%1").arg(fan);
+    QString icon;
+    switch (fan)
+    {
+    case 1:
+        icon = ":/images/manual_button/fan_1.png";
+        break;
+    case 2:
+        icon = ":/images/manual_button/fan_2.png";
+        break;
+    case 3:
+        icon = ":/images/manual_button/fan_3.png";
+        break;
+    case 4:
+        icon = ":/images/manual_button/fan_4.png";
+        break;
+    case 5:
+        icon = ":/images/manual_button/fan_5.png";
+        break;
+    default:
+        break;
+    }
+
+    showInfoText(text, icon);
 }
 void ManualCookWindow::on_preheatButton_clicked()
@@ -1056,12 +1078,12 @@ void ManualCookWindow::on_damperButton_clicked()
     if (oven->damper())
     {
         oven->closeDamper();
-        showInfoText("OFF");
+        showInfoText("OFF", ":/images/manual_button/damper_close.png");
     }
     else
     {
         oven->openDamper();
-        showInfoText("ON");
+        showInfoText("ON", ":/images/manual_button/damper_open.png");
     }
 }
@@ -1070,12 +1092,12 @@ void ManualCookWindow::on_humidificationButton_clicked()
     if (oven->humidification())
     {
         oven->stopHumidification();
-        showInfoText("OFF");
+        showInfoText("OFF", ":/images/manual_button/side_nozzle_close.png");
     }
     else
     {
         oven->startHumidification(5);
-        showInfoText("ON");
+        showInfoText("ON", ":/images/manual_button/side_nozzle_open.png");
     }
 }
@@ -1084,13 +1106,13 @@ void ManualCookWindow::on_repeatButton_clicked()
     if (repeat)
     {
         repeat = false;
-        showInfoText("OFF");
+        showInfoText("OFF", ":/images/manual_button/repeat.png");
         updateView();
     }
     else
     {
         repeat = true;
-        showInfoText("ON");
+        showInfoText("ON", ":/images/manual_button/repeat_ov.png");
         updateView();
         repeatSetting.mode = oven->mode();
@@ -41,7 +41,7 @@ private slots:
     void hideCurrentHumidity();
     void showCurrentTemp();
     void hideCurrentTemp();
-    void showInfoText(QString text);
+    void showInfoText(QString text, QString icon);
     void onOvenUpdated(Oven *oven);
@@ -1311,16 +1311,21 @@ QPushButton:checked:focus
     </property>
     <property name="font">
      <font>
-      <pointsize>48</pointsize>
+      <pointsize>52</pointsize>
       <weight>75</weight>
       <bold>true</bold>
      </font>
     </property>
     <property name="styleSheet">
-     <string notr="true">color: rgba(255, 255, 255, 255);</string>
+     <string notr="true">background-image: url(:/images/error/background.png);
+background-repeat: no-repeat;
+background-position: center center;
+border-radius: 40px;
+color: rgba(255, 255, 255, 255);
+margin: 200px 300px;</string>
     </property>
     <property name="text">
-     <string>ON</string>
+     <string>&lt;img src=&quot;:/images/manual_button/fan_1.png&quot;/&gt;&lt;span&gt;1&lt;/span&gt;</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5		5
6	#define MAJOR_VER 1	6	#define MAJOR_VER 1
7	#define MINOR_VER 5	7	#define MINOR_VER 5
8	-#define HOTFIX_VER 00	8	+#define HOTFIX_VER 01
9		9
10	// 0 for normal	10	// 0 for normal
11	// 1 for premium	11	// 1 for premium
	@@ -41,7 +41,7 @@ private slots:		@@ -41,7 +41,7 @@ private slots:
41	void hideCurrentHumidity();	41	void hideCurrentHumidity();
42	void showCurrentTemp();	42	void showCurrentTemp();
43	void hideCurrentTemp();	43	void hideCurrentTemp();
44	- void showInfoText(QString text);	44	+ void showInfoText(QString text, QString icon);
45		45
46	void onOvenUpdated(Oven *oven);	46	void onOvenUpdated(Oven *oven);
47		47