에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 4fc65fb819a2b724329d251479da4de2210e2c4f

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

GUI V0.1.6(이 버전으로 배포) 

 - 기능 테스트 화면 이미지 깨짐 수정
 - 기능 테스트 화면 이미지 정리
 - 수동 메뉴에서 요리 시간 설정 후 예열 팝업을 띄울 경우 예열 팝업이 뜬 채로 요리가 시작되는 문제 수정
Showing 11 changed files with 42 additions and 16 deletions   Show diff stats
app/gui/oven_control/functiontestwindow.cpp
  Diff comments   View file @4fc65fb
... ... @@ -57,6 +57,6 @@ void FunctionTestWindow::on_fanTestButton_clicked()
57 57  
58 58 void FunctionTestWindow::on_gasTestButton_clicked()
59 59 {
60   - GasTestWindow *w = new GasTestWindow(this, udp);
61   - w->showFullScreen();
  60 +// GasTestWindow *w = new GasTestWindow(this, udp);
  61 +// w->showFullScreen();
62 62 }
... ...
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @4fc65fb
... ... @@ -60,7 +60,7 @@
60 60 </rect>
61 61 </property>
62 62 <property name="styleSheet">
63   - <string notr="true">background-image: url(:/images/images/config_service/088_panne_service_01.png);</string>
  63 + <string notr="true">background-image: url(:/images/config/pannel.png);</string>
64 64 </property>
65 65 </widget>
66 66 <widget class="QPushButton" name="burnerTestButton">
... ... @@ -87,8 +87,8 @@
87 87 </font>
88 88 </property>
89 89 <property name="styleSheet">
90   - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/090_set_eng_btn_02.png); }
91   -QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_eng_btn_02_ov.png); }</string>
  90 + <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
  91 +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
92 92 </property>
93 93 <property name="text">
94 94 <string>가열부</string>
... ... @@ -118,8 +118,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
118 118 </font>
119 119 </property>
120 120 <property name="styleSheet">
121   - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/090_set_eng_btn_02.png); }
122   -QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_eng_btn_02_ov.png); }</string>
  121 + <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
  122 +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
123 123 </property>
124 124 <property name="text">
125 125 <string>구성품</string>
... ... @@ -149,8 +149,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
149 149 </font>
150 150 </property>
151 151 <property name="styleSheet">
152   - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/090_set_eng_btn_02.png); }
153   -QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_eng_btn_02_ov.png); }</string>
  152 + <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
  153 +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
154 154 </property>
155 155 <property name="text">
156 156 <string>급수밸브</string>
... ... @@ -180,8 +180,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
180 180 </font>
181 181 </property>
182 182 <property name="styleSheet">
183   - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/090_set_eng_btn_02.png); }
184   -QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_eng_btn_02_ov.png); }</string>
  183 + <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
  184 +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
185 185 </property>
186 186 <property name="text">
187 187 <string>세척</string>
... ... @@ -211,8 +211,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
211 211 </font>
212 212 </property>
213 213 <property name="styleSheet">
214   - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/090_set_eng_btn_02.png); }
215   -QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_eng_btn_02_ov.png); }</string>
  214 + <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
  215 +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
216 216 </property>
217 217 <property name="text">
218 218 <string>팬모터</string>
... ... @@ -242,8 +242,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
242 242 </font>
243 243 </property>
244 244 <property name="styleSheet">
245   - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/090_set_eng_btn_02.png); }
246   -QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_eng_btn_02_ov.png); }</string>
  245 + <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
  246 +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
247 247 </property>
248 248 <property name="text">
249 249 <string>연소가스동작</string>
... ...
app/gui/oven_control/images/config/088_panne_basic.png
View file @61ba89b

9.74 KB
app/gui/oven_control/images/config/088_panne_basic_ov.png
View file @61ba89b

9.96 KB
app/gui/oven_control/images/config/088_panne_service_01.png
View file @61ba89b

9.74 KB
app/gui/oven_control/images/config/088_panne_service_01_ov.png
View file @61ba89b

9.96 KB
app/gui/oven_control/images/config/pannel.png
  Diff comments   View file @4fc65fb

9.74 KB
app/gui/oven_control/images/config/pannel_ov.png
  Diff comments   View file @4fc65fb

9.96 KB
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @4fc65fb
... ... @@ -50,7 +50,7 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Oven *oven, UdpHandler *udp)
50 50 connect(cookingTimerCheckTimer, SIGNAL(timeout()), this, SLOT(checkTime()));
51 51 connect(this, SIGNAL(modeButtonClicked()), cookingTimerCheckTimer, SLOT(stop()));
52 52  
53   - QTimer *cookingStartTimer = new QTimer(this);
  53 + cookingStartTimer = new QTimer(this);
54 54 cookingStartTimer->setSingleShot(true);
55 55 cookingStartTimer->setInterval(3000);
56 56 connect(ui->timeSlider, SIGNAL(valueChanged(int)), cookingStartTimer, SLOT(start()));
... ... @@ -364,6 +364,8 @@ void ManualCookWindow::on_interTempButton_clicked()
364 364  
365 365 void ManualCookWindow::on_preheatButton_clicked()
366 366 {
  367 + cookingStartTimer->stop();
  368 +
367 369 PreheatPopup *p = new PreheatPopup(this, oven);
368 370 p->setWindowModality(Qt::WindowModal);
369 371 p->showFullScreen();
... ...
app/gui/oven_control/manualcookwindow.h
  Diff comments   View file @4fc65fb
... ... @@ -58,6 +58,7 @@ private:
58 58 Ui::ManualCookWindow *ui;
59 59 Oven *oven;
60 60 UdpHandler *udp;
  61 + QTimer *cookingStartTimer;
61 62  
62 63 int humidity;
63 64 int temp;
... ...
app/gui/oven_control/resources.qrc
  Diff comments   View file @4fc65fb
... ... @@ -390,5 +390,28 @@
390 390 <file>images/animation/pull_02.png</file>
391 391 <file>images/animation/pull_03.png</file>
392 392 <file>images/animation/pull_04.png</file>
  393 + <file>images/config/002_btn_line_h.png</file>
  394 + <file>images/config/002_btn_line_w.png</file>
  395 + <file>images/config/050_setting_btn_01.png</file>
  396 + <file>images/config/050_setting_btn_01_ov.png</file>
  397 + <file>images/config/050_setting_btn_02.png</file>
  398 + <file>images/config/050_setting_btn_02_ov.png</file>
  399 + <file>images/config/050_setting_btn_03.png</file>
  400 + <file>images/config/050_setting_btn_03_ov.png</file>
  401 + <file>images/config/050_setting_btn_04.png</file>
  402 + <file>images/config/050_setting_btn_04_ov.png</file>
  403 + <file>images/config/050_setting_btn_05.png</file>
  404 + <file>images/config/050_setting_btn_05_ov.png</file>
  405 + <file>images/config/050_setting_btn_06.png</file>
  406 + <file>images/config/050_setting_btn_06_ov.png</file>
  407 + <file>images/config/050_setting_btn_07.png</file>
  408 + <file>images/config/050_setting_btn_07_ov.png</file>
  409 + <file>images/config/050_setting_btn_08.png</file>
  410 + <file>images/config/050_setting_btn_08_ov.png</file>
  411 + <file>images/config/051_password_icon.png</file>
  412 + <file>images/config/088_fava_01.png</file>
  413 + <file>images/config/088_fava_02.png</file>
  414 + <file>images/config/pannel.png</file>
  415 + <file>images/config/pannel_ov.png</file>
393 416 </qresource>
394 417 </RCC>
... ...