에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit cd74cf6ed2d98fee0720b4d9be4fbeefbed1a38c

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

엔코더 관련 디자인 변경 적용

Showing 4 changed files with 36 additions and 31 deletions   Show diff stats
app/gui/oven_control/autocookconfigwindow.cpp
  Diff comments   View file @cd74cf6
... ... @@ -166,6 +166,8 @@ void AutoCookConfigWindow::afterThreeSecs()
166 166 }
167 167 else
168 168 start();
  169 +
  170 + updateView();
169 171 }
170 172  
171 173 void AutoCookConfigWindow::changeCook(Cook cook)
... ... @@ -221,6 +223,8 @@ void AutoCookConfigWindow::onEncoderClicked(QWidget *clicked)
221 223 else if (slider == ui->configSlider_5)
222 224 ui->configButton_5->setFocus();
223 225 }
  226 +
  227 + updateView();
224 228 }
225 229 }
226 230  
... ...
app/gui/oven_control/define.cpp
  Diff comments   View file @cd74cf6
... ... @@ -218,29 +218,29 @@ QString Define::iconOverlay(Define::CookConfigType type)
218 218 switch (type)
219 219 {
220 220 case Brightness:
221   - return ":/images/slider_icon/gau_icon_01_ov.png";
  221 + return ":/images/slider_icon/gau_icon_01_active.png";
222 222 case BurnDegree:
223   - return ":/images/slider_icon/gau_icon_02_ov.png";
  223 + return ":/images/slider_icon/gau_icon_02_active.png";
224 224 case SoftBoilDegree:
225   - return ":/images/slider_icon/gau_icon_03_ov.png";
  225 + return ":/images/slider_icon/sys_icon_05_active.png";
226 226 case PieceSize:
227   - return ":/images/slider_icon/gau_icon_04_ov.png";
  227 + return ":/images/slider_icon/sys_icon_01_active.png";
228 228 case CrispyDegree:
229   - return ":/images/slider_icon/gau_icon_05_ov.png";
  229 + return ":/images/slider_icon/sys_icon_02_active.png";
230 230 case MoistDegree:
231   - return ":/images/slider_icon/Gau_icon_06_ov.png";
  231 + return ":/images/slider_icon/sys_icon_03_active.png";
232 232 case Thickness:
233   - return ":/images/slider_icon/Gau_icon_07_ov.png";
  233 + return ":/images/slider_icon/sys_icon_04_active.png";
234 234 case Humidity:
235   - return ":/images/slider_icon/humidity_ov.png";
  235 + return ":/images/slider_icon/011_icon_01_active.png";
236 236 case Temperature:
237   - return ":/images/slider_icon/temp_ov.png";
  237 + return ":/images/slider_icon/011_icon_02_active.png";
238 238 case Time:
239   - return ":/images/slider_icon/time_ov.png";
  239 + return ":/images/slider_icon/011_icon_03_active.png";
240 240 case CoreTemperature:
241   - return ":/images/slider_icon/core_temp_ov.png";
  241 + return ":/images/slider_icon/011_icon_04_active.png";
242 242 case Thermometer:
243   - return ":/images/slider_icon/thermometer_ov.png";
  243 + return ":/images/slider_icon/cen_mt_icon_03_active.png";
244 244 case InvalidConfig:
245 245 case ConfigNotUsed:
246 246 default:
... ... @@ -253,29 +253,29 @@ QString Define::iconActiveted(Define::CookConfigType type)
253 253 switch (type)
254 254 {
255 255 case Brightness:
256   - return ":/images/slider_icon/gau_icon_01_active.png";
  256 + return ":/images/slider_icon/gau_icon_01_ov.png";
257 257 case BurnDegree:
258   - return ":/images/slider_icon/gau_icon_02_active.png";
  258 + return ":/images/slider_icon/gau_icon_02_ov.png";
259 259 case SoftBoilDegree:
260   - return ":/images/slider_icon/sys_icon_05_active.png";
  260 + return ":/images/slider_icon/gau_icon_03_ov.png";
261 261 case PieceSize:
262   - return ":/images/slider_icon/sys_icon_01_active.png";
  262 + return ":/images/slider_icon/gau_icon_04_ov.png";
263 263 case CrispyDegree:
264   - return ":/images/slider_icon/sys_icon_02_active.png";
  264 + return ":/images/slider_icon/gau_icon_05_ov.png";
265 265 case MoistDegree:
266   - return ":/images/slider_icon/sys_icon_03_active.png";
  266 + return ":/images/slider_icon/Gau_icon_06_ov.png";
267 267 case Thickness:
268   - return ":/images/slider_icon/sys_icon_04_active.png";
  268 + return ":/images/slider_icon/Gau_icon_07_ov.png";
269 269 case Humidity:
270   - return ":/images/slider_icon/011_icon_01_active.png";
  270 + return ":/images/slider_icon/humidity_ov.png";
271 271 case Temperature:
272   - return ":/images/slider_icon/011_icon_02_active.png";
  272 + return ":/images/slider_icon/temp_ov.png";
273 273 case Time:
274   - return ":/images/slider_icon/011_icon_03_active.png";
  274 + return ":/images/slider_icon/time_ov.png";
275 275 case CoreTemperature:
276   - return ":/images/slider_icon/011_icon_04_active.png";
  276 + return ":/images/slider_icon/core_temp_ov.png";
277 277 case Thermometer:
278   - return ":/images/slider_icon/cen_mt_icon_03_active.png";
  278 + return ":/images/slider_icon/thermometer_ov.png";
279 279 case InvalidConfig:
280 280 case ConfigNotUsed:
281 281 default:
... ...
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @cd74cf6
... ... @@ -371,12 +371,7 @@ void ManualCookWindow::updateView()
371 371 ui->interTempLabel->setText(Stringer::unusedTemperature(Stringer::fontSize14));
372 372 }
373 373  
374   - bool cooking = oven->cooking();
375   - if (cooking != lastViewCooking)
376   - {
377   - lastViewCooking = cooking;
378   - ui->runStopButton->setChecked(cooking);
379   - }
  374 + ui->runStopButton->setChecked(oven->cooking());
380 375  
381 376 if (showFrontButtons)
382 377 {
... ... @@ -909,8 +904,10 @@ void ManualCookWindow::on_runStopButton_clicked()
909 904 {
910 905 if (oven->cooking())
911 906 stop();
912   - else
  907 + else if (oven->time() > 0)
913 908 start();
  909 +
  910 + updateView();
914 911 }
915 912  
916 913 void ManualCookWindow::on_fanButton_clicked()
... ...
app/gui/oven_control/programmingautoconfigwindow.cpp
  Diff comments   View file @cd74cf6
... ... @@ -170,6 +170,8 @@ void ProgrammingAutoConfigWindow::onEncoderClicked(QWidget *clicked)
170 170 ui->configButton_4->setFocus();
171 171 else if (slider == ui->configSlider_5)
172 172 ui->configButton_5->setFocus();
  173 +
  174 + updateView();
173 175 }
174 176 }
175 177  
... ... @@ -304,6 +306,8 @@ void ProgrammingAutoConfigWindow::afterThreeSecs()
304 306 ui->configButton_4->setFocus();
305 307 else if (slider == ui->configSlider_5)
306 308 ui->configButton_5->setFocus();
  309 +
  310 + updateView();
307 311 }
308 312 }
309 313  
... ...