에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 0fbf1932cd18beeac363f311fd3a49f1e731d2ce

Authored by 김태훈
1 parent 10d2268c28
Exists in master and in 2 other branches fhd, fhd-demo

V1.5.0.2 

요청 사항 반영
- OFF 문자열 표시가 잘리는 문제 수정
- 쿨다운 팝업에서 조작할 때도 상태 변경 알림이 나오도록 수정
Showing 4 changed files with 31 additions and 32 deletions   Show diff stats
app/gui/oven_control/cooldownpopup.cpp
  Diff comments   View file @0fbf193
@@ -44,6 +44,8 @@ CooldownPopup::CooldownPopup(QWidget *parent, int target) : @@ -44,6 +44,8 @@ CooldownPopup::CooldownPopup(QWidget *parent, int target) :
44 if (needCookStarting) 44 if (needCookStarting)
45 oven->stopCooking(); 45 oven->stopCooking();
46 46
  47 + oven->setFan(expectingFanLevel);
  48 +
47 connect(oven, SIGNAL(changed(Oven*)), SLOT(updateView())); 49 connect(oven, SIGNAL(changed(Oven*)), SLOT(updateView()));
48 50
49 cooldownStartTimer.setSingleShot(true); 51 cooldownStartTimer.setSingleShot(true);
@@ -272,10 +274,7 @@ void CooldownPopup::on_fanButton_clicked() @@ -272,10 +274,7 @@ void CooldownPopup::on_fanButton_clicked()
272 if (expectingFanLevel < oven->minFan()) 274 if (expectingFanLevel < oven->minFan())
273 expectingFanLevel = oven->maxFan(); 275 expectingFanLevel = oven->maxFan();
274 276
275 - if (oven->cooldown())  
276 - oven->setFan(expectingFanLevel);  
277 - else  
278 - updateView(); 277 + oven->setFan(expectingFanLevel);
279 278
280 if (cooldownStartTimer.isActive()) 279 if (cooldownStartTimer.isActive())
281 cooldownStartTimer.start(); 280 cooldownStartTimer.start();
app/gui/oven_control/define.h
  Diff comments   View file @0fbf193
@@ -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 01 8 +#define HOTFIX_VER 02
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @0fbf193
@@ -487,6 +487,31 @@ QPushButton:focus { background-image: url(%2); }&quot;); @@ -487,6 +487,31 @@ QPushButton:focus { background-image: url(%2); }&quot;);
487 int fan = oven->fan(); 487 int fan = oven->fan();
488 if (fan != lastViewFan) 488 if (fan != lastViewFan)
489 { 489 {
  490 + if (lastViewFan != -1)
  491 + {
  492 + switch (fan)
  493 + {
  494 + case 1:
  495 + showInfoText("1", ":/images/manual_button/fan_1.png");
  496 + break;
  497 + case 2:
  498 + showInfoText("2", ":/images/manual_button/fan_2.png");
  499 + break;
  500 + case 3:
  501 + showInfoText("3", ":/images/manual_button/fan_3.png");
  502 + break;
  503 + case 4:
  504 + showInfoText("4", ":/images/manual_button/fan_4.png");
  505 + break;
  506 + case 5:
  507 + showInfoText("5", ":/images/manual_button/fan_5.png");
  508 + break;
  509 + default:
  510 + showInfoText("6", ":/images/manual_button/fan_6.png");
  511 + break;
  512 + }
  513 + }
  514 +
490 lastViewFan = fan; 515 lastViewFan = fan;
491 516
492 switch (fan) 517 switch (fan)
@@ -1034,31 +1059,6 @@ void ManualCookWindow::on_fanButton_clicked() @@ -1034,31 +1059,6 @@ void ManualCookWindow::on_fanButton_clicked()
1034 fan = oven->minFan(); 1059 fan = oven->minFan();
1035 1060
1036 oven->setFan(fan); 1061 oven->setFan(fan);
1037 -  
1038 - QString text = QString("%1").arg(fan);  
1039 - QString icon;  
1040 - switch (fan)  
1041 - {  
1042 - case 1:  
1043 - icon = ":/images/manual_button/fan_1.png";  
1044 - break;  
1045 - case 2:  
1046 - icon = ":/images/manual_button/fan_2.png";  
1047 - break;  
1048 - case 3:  
1049 - icon = ":/images/manual_button/fan_3.png";  
1050 - break;  
1051 - case 4:  
1052 - icon = ":/images/manual_button/fan_4.png";  
1053 - break;  
1054 - case 5:  
1055 - icon = ":/images/manual_button/fan_5.png";  
1056 - break;  
1057 - default:  
1058 - break;  
1059 - }  
1060 -  
1061 - showInfoText(text, icon);  
1062 } 1062 }
1063 1063
1064 void ManualCookWindow::on_preheatButton_clicked() 1064 void ManualCookWindow::on_preheatButton_clicked()
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @0fbf193
@@ -1322,10 +1322,10 @@ background-repeat: no-repeat; @@ -1322,10 +1322,10 @@ background-repeat: no-repeat;
1322 background-position: center center; 1322 background-position: center center;
1323 border-radius: 40px; 1323 border-radius: 40px;
1324 color: rgba(255, 255, 255, 255); 1324 color: rgba(255, 255, 255, 255);
1325 -margin: 200px 300px;</string> 1325 +margin: 200px 200px;</string>
1326 </property> 1326 </property>
1327 <property name="text"> 1327 <property name="text">
1328 - <string>&lt;img src=&quot;:/images/manual_button/fan_1.png&quot;/&gt;&lt;span&gt;1&lt;/span&gt;</string> 1328 + <string>&lt;img src=&quot;:/images/manual_button/fan_1.png&quot;/&gt;&lt;span&gt; OFF&lt;/span&gt;</string>
1329 </property> 1329 </property>
1330 <property name="alignment"> 1330 <property name="alignment">
1331 <set>Qt::AlignCenter</set> 1331 <set>Qt::AlignCenter</set>