에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 5f017a9d79e14cdc5762ece2f602c10b9e99424f

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

요청 사항 반영 

- 점화 아이콘, 수위 아이콘 추가
Showing 52 changed files with 1597 additions and 35 deletions   Show diff stats
app/app-prime-modbus/include/all_share.h
  Diff comments   View file @5f017a9
@@ -226,6 +226,9 @@ typedef struct { @@ -226,6 +226,9 @@ typedef struct {
226 U16 burner2_current_rpm; // 36 226 U16 burner2_current_rpm; // 36
227 U16 burner3_current_rpm; // 37 227 U16 burner3_current_rpm; // 37
228 U16 controller_error; // 38 228 U16 controller_error; // 38
  229 + U16 burner1_state; // 39
  230 + U16 burner2_state; // 3A
  231 + U16 burner3_state; // 3B
229 U16 error_cnt[16]; // 에러 카운트 232 U16 error_cnt[16]; // 에러 카운트
230 } STRUCT_PACK oven_state_t; 233 } STRUCT_PACK oven_state_t;
231 234
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @5f017a9
@@ -84,6 +84,19 @@ @@ -84,6 +84,19 @@
84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
85 </property> 85 </property>
86 </widget> 86 </widget>
  87 + <widget class="IgnitionIcon" name="label_7">
  88 + <property name="geometry">
  89 + <rect>
  90 + <x>662</x>
  91 + <y>164</y>
  92 + <width>111</width>
  93 + <height>121</height>
  94 + </rect>
  95 + </property>
  96 + <property name="text">
  97 + <string/>
  98 + </property>
  99 + </widget>
87 </widget> 100 </widget>
88 <widget class="QWidget" name="page_2"/> 101 <widget class="QWidget" name="page_2"/>
89 </widget> 102 </widget>
@@ -360,6 +373,19 @@ QPushButton { @@ -360,6 +373,19 @@ QPushButton {
360 </size> 373 </size>
361 </property> 374 </property>
362 </widget> 375 </widget>
  376 + <widget class="WaterLevelIcon" name="label_6">
  377 + <property name="geometry">
  378 + <rect>
  379 + <x>670</x>
  380 + <y>290</y>
  381 + <width>111</width>
  382 + <height>121</height>
  383 + </rect>
  384 + </property>
  385 + <property name="text">
  386 + <string/>
  387 + </property>
  388 + </widget>
363 <zorder>label</zorder> 389 <zorder>label</zorder>
364 <zorder>upperStack</zorder> 390 <zorder>upperStack</zorder>
365 <zorder>label_15</zorder> 391 <zorder>label_15</zorder>
@@ -368,6 +394,7 @@ QPushButton { @@ -368,6 +394,7 @@ QPushButton {
368 <zorder>btnAdjust</zorder> 394 <zorder>btnAdjust</zorder>
369 <zorder>btnAdjust_LCD</zorder> 395 <zorder>btnAdjust_LCD</zorder>
370 <zorder>btnClearWashData</zorder> 396 <zorder>btnClearWashData</zorder>
  397 + <zorder>label_6</zorder>
371 </widget> 398 </widget>
372 </widget> 399 </widget>
373 <customwidgets> 400 <customwidgets>
@@ -397,6 +424,16 @@ QPushButton { @@ -397,6 +424,16 @@ QPushButton {
397 <extends>QLabel</extends> 424 <extends>QLabel</extends>
398 <header>digitalclock.h</header> 425 <header>digitalclock.h</header>
399 </customwidget> 426 </customwidget>
  427 + <customwidget>
  428 + <class>IgnitionIcon</class>
  429 + <extends>QLabel</extends>
  430 + <header>ignitionicon.h</header>
  431 + </customwidget>
  432 + <customwidget>
  433 + <class>WaterLevelIcon</class>
  434 + <extends>QLabel</extends>
  435 + <header>waterlevelicon.h</header>
  436 + </customwidget>
400 </customwidgets> 437 </customwidgets>
401 <resources> 438 <resources>
402 <include location="resources.qrc"/> 439 <include location="resources.qrc"/>
app/gui/oven_control/autocookcheckconfigwindow.ui
  Diff comments   View file @5f017a9
@@ -371,6 +371,19 @@ border: none; @@ -371,6 +371,19 @@ border: none;
371 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 371 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
372 </property> 372 </property>
373 </widget> 373 </widget>
  374 + <widget class="IgnitionIcon" name="label_5">
  375 + <property name="geometry">
  376 + <rect>
  377 + <x>662</x>
  378 + <y>164</y>
  379 + <width>111</width>
  380 + <height>121</height>
  381 + </rect>
  382 + </property>
  383 + <property name="text">
  384 + <string/>
  385 + </property>
  386 + </widget>
374 </widget> 387 </widget>
375 <widget class="QWidget" name="page_2"/> 388 <widget class="QWidget" name="page_2"/>
376 </widget> 389 </widget>
@@ -1333,6 +1346,19 @@ border-image: url(:/images/button/288_ov.png); @@ -1333,6 +1346,19 @@ border-image: url(:/images/button/288_ov.png);
1333 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> 1346 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
1334 </property> 1347 </property>
1335 </widget> 1348 </widget>
  1349 + <widget class="WaterLevelIcon" name="label_6">
  1350 + <property name="geometry">
  1351 + <rect>
  1352 + <x>670</x>
  1353 + <y>290</y>
  1354 + <width>111</width>
  1355 + <height>121</height>
  1356 + </rect>
  1357 + </property>
  1358 + <property name="text">
  1359 + <string/>
  1360 + </property>
  1361 + </widget>
1336 </widget> 1362 </widget>
1337 </widget> 1363 </widget>
1338 <customwidgets> 1364 <customwidgets>
@@ -1363,6 +1389,16 @@ border-image: url(:/images/button/288_ov.png); @@ -1363,6 +1389,16 @@ border-image: url(:/images/button/288_ov.png);
1363 <header>digitalclock.h</header> 1389 <header>digitalclock.h</header>
1364 </customwidget> 1390 </customwidget>
1365 <customwidget> 1391 <customwidget>
  1392 + <class>IgnitionIcon</class>
  1393 + <extends>QLabel</extends>
  1394 + <header>ignitionicon.h</header>
  1395 + </customwidget>
  1396 + <customwidget>
  1397 + <class>WaterLevelIcon</class>
  1398 + <extends>QLabel</extends>
  1399 + <header>waterlevelicon.h</header>
  1400 + </customwidget>
  1401 + <customwidget>
1366 <class>Slider</class> 1402 <class>Slider</class>
1367 <extends>QWidget</extends> 1403 <extends>QWidget</extends>
1368 <header>slider.h</header> 1404 <header>slider.h</header>
app/gui/oven_control/autocookcheckwindow.ui
  Diff comments   View file @5f017a9
@@ -176,6 +176,32 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu @@ -176,6 +176,32 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu
176 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 176 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
177 </property> 177 </property>
178 </widget> 178 </widget>
  179 + <widget class="WaterLevelIcon" name="label_6">
  180 + <property name="geometry">
  181 + <rect>
  182 + <x>670</x>
  183 + <y>290</y>
  184 + <width>111</width>
  185 + <height>121</height>
  186 + </rect>
  187 + </property>
  188 + <property name="text">
  189 + <string/>
  190 + </property>
  191 + </widget>
  192 + <widget class="IgnitionIcon" name="label_7">
  193 + <property name="geometry">
  194 + <rect>
  195 + <x>662</x>
  196 + <y>164</y>
  197 + <width>111</width>
  198 + <height>121</height>
  199 + </rect>
  200 + </property>
  201 + <property name="text">
  202 + <string/>
  203 + </property>
  204 + </widget>
179 </widget> 205 </widget>
180 <widget class="QWidget" name="page_2"/> 206 <widget class="QWidget" name="page_2"/>
181 </widget> 207 </widget>
@@ -818,14 +844,24 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b @@ -818,14 +844,24 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
818 <header>halfenergyicon.h</header> 844 <header>halfenergyicon.h</header>
819 </customwidget> 845 </customwidget>
820 <customwidget> 846 <customwidget>
821 - <class>AnimatedImageBox</class> 847 + <class>DigitalClock</class>
822 <extends>QLabel</extends> 848 <extends>QLabel</extends>
823 - <header>animatedimagebox.h</header> 849 + <header>digitalclock.h</header>
824 </customwidget> 850 </customwidget>
825 <customwidget> 851 <customwidget>
826 - <class>DigitalClock</class> 852 + <class>IgnitionIcon</class>
827 <extends>QLabel</extends> 853 <extends>QLabel</extends>
828 - <header>digitalclock.h</header> 854 + <header>ignitionicon.h</header>
  855 + </customwidget>
  856 + <customwidget>
  857 + <class>WaterLevelIcon</class>
  858 + <extends>QLabel</extends>
  859 + <header>waterlevelicon.h</header>
  860 + </customwidget>
  861 + <customwidget>
  862 + <class>AnimatedImageBox</class>
  863 + <extends>QLabel</extends>
  864 + <header>animatedimagebox.h</header>
829 </customwidget> 865 </customwidget>
830 <customwidget> 866 <customwidget>
831 <class>HumidityCircularGauge</class> 867 <class>HumidityCircularGauge</class>
app/gui/oven_control/autocookconfigwindow.ui
  Diff comments   View file @5f017a9
@@ -128,6 +128,32 @@ border: none; @@ -128,6 +128,32 @@ border: none;
128 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 128 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
129 </property> 129 </property>
130 </widget> 130 </widget>
  131 + <widget class="WaterLevelIcon" name="label_6">
  132 + <property name="geometry">
  133 + <rect>
  134 + <x>670</x>
  135 + <y>290</y>
  136 + <width>111</width>
  137 + <height>121</height>
  138 + </rect>
  139 + </property>
  140 + <property name="text">
  141 + <string/>
  142 + </property>
  143 + </widget>
  144 + <widget class="IgnitionIcon" name="label_5">
  145 + <property name="geometry">
  146 + <rect>
  147 + <x>662</x>
  148 + <y>164</y>
  149 + <width>111</width>
  150 + <height>121</height>
  151 + </rect>
  152 + </property>
  153 + <property name="text">
  154 + <string/>
  155 + </property>
  156 + </widget>
131 </widget> 157 </widget>
132 <widget class="QWidget" name="page_2"/> 158 <widget class="QWidget" name="page_2"/>
133 </widget> 159 </widget>
@@ -1465,6 +1491,16 @@ border-image: url(:/images/button/152_ov.png); @@ -1465,6 +1491,16 @@ border-image: url(:/images/button/152_ov.png);
1465 <header>digitalclock.h</header> 1491 <header>digitalclock.h</header>
1466 </customwidget> 1492 </customwidget>
1467 <customwidget> 1493 <customwidget>
  1494 + <class>IgnitionIcon</class>
  1495 + <extends>QLabel</extends>
  1496 + <header>ignitionicon.h</header>
  1497 + </customwidget>
  1498 + <customwidget>
  1499 + <class>WaterLevelIcon</class>
  1500 + <extends>QLabel</extends>
  1501 + <header>waterlevelicon.h</header>
  1502 + </customwidget>
  1503 + <customwidget>
1468 <class>Slider</class> 1504 <class>Slider</class>
1469 <extends>QWidget</extends> 1505 <extends>QWidget</extends>
1470 <header>slider.h</header> 1506 <header>slider.h</header>
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_6">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_5">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -234,6 +260,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h @@ -234,6 +260,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
234 <extends>QLabel</extends> 260 <extends>QLabel</extends>
235 <header>digitalclock.h</header> 261 <header>digitalclock.h</header>
236 </customwidget> 262 </customwidget>
  263 + <customwidget>
  264 + <class>IgnitionIcon</class>
  265 + <extends>QLabel</extends>
  266 + <header>ignitionicon.h</header>
  267 + </customwidget>
  268 + <customwidget>
  269 + <class>WaterLevelIcon</class>
  270 + <extends>QLabel</extends>
  271 + <header>waterlevelicon.h</header>
  272 + </customwidget>
237 </customwidgets> 273 </customwidgets>
238 <resources/> 274 <resources/>
239 <connections/> 275 <connections/>
app/gui/oven_control/autocookwindow.ui
  Diff comments   View file @5f017a9
@@ -87,6 +87,32 @@ border: none; @@ -87,6 +87,32 @@ border: none;
87 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 87 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
88 </property> 88 </property>
89 </widget> 89 </widget>
  90 + <widget class="WaterLevelIcon" name="label_7">
  91 + <property name="geometry">
  92 + <rect>
  93 + <x>670</x>
  94 + <y>290</y>
  95 + <width>111</width>
  96 + <height>121</height>
  97 + </rect>
  98 + </property>
  99 + <property name="text">
  100 + <string/>
  101 + </property>
  102 + </widget>
  103 + <widget class="IgnitionIcon" name="label_8">
  104 + <property name="geometry">
  105 + <rect>
  106 + <x>662</x>
  107 + <y>164</y>
  108 + <width>111</width>
  109 + <height>121</height>
  110 + </rect>
  111 + </property>
  112 + <property name="text">
  113 + <string/>
  114 + </property>
  115 + </widget>
90 </widget> 116 </widget>
91 <widget class="QWidget" name="page_2"/> 117 <widget class="QWidget" name="page_2"/>
92 </widget> 118 </widget>
@@ -1432,14 +1458,24 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o @@ -1432,14 +1458,24 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
1432 <header>halfenergyicon.h</header> 1458 <header>halfenergyicon.h</header>
1433 </customwidget> 1459 </customwidget>
1434 <customwidget> 1460 <customwidget>
1435 - <class>AnimatedImageBox</class> 1461 + <class>DigitalClock</class>
1436 <extends>QLabel</extends> 1462 <extends>QLabel</extends>
1437 - <header>animatedimagebox.h</header> 1463 + <header>digitalclock.h</header>
1438 </customwidget> 1464 </customwidget>
1439 <customwidget> 1465 <customwidget>
1440 - <class>DigitalClock</class> 1466 + <class>IgnitionIcon</class>
1441 <extends>QLabel</extends> 1467 <extends>QLabel</extends>
1442 - <header>digitalclock.h</header> 1468 + <header>ignitionicon.h</header>
  1469 + </customwidget>
  1470 + <customwidget>
  1471 + <class>WaterLevelIcon</class>
  1472 + <extends>QLabel</extends>
  1473 + <header>waterlevelicon.h</header>
  1474 + </customwidget>
  1475 + <customwidget>
  1476 + <class>AnimatedImageBox</class>
  1477 + <extends>QLabel</extends>
  1478 + <header>animatedimagebox.h</header>
1443 </customwidget> 1479 </customwidget>
1444 <customwidget> 1480 <customwidget>
1445 <class>HumidityCircularGauge</class> 1481 <class>HumidityCircularGauge</class>
app/gui/oven_control/burnertestwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_11">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_12">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -2152,6 +2178,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -2152,6 +2178,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
2152 <extends>QLabel</extends> 2178 <extends>QLabel</extends>
2153 <header>digitalclock.h</header> 2179 <header>digitalclock.h</header>
2154 </customwidget> 2180 </customwidget>
  2181 + <customwidget>
  2182 + <class>IgnitionIcon</class>
  2183 + <extends>QLabel</extends>
  2184 + <header>ignitionicon.h</header>
  2185 + </customwidget>
  2186 + <customwidget>
  2187 + <class>WaterLevelIcon</class>
  2188 + <extends>QLabel</extends>
  2189 + <header>waterlevelicon.h</header>
  2190 + </customwidget>
2155 </customwidgets> 2191 </customwidgets>
2156 <resources> 2192 <resources>
2157 <include location="resources.qrc"/> 2193 <include location="resources.qrc"/>
app/gui/oven_control/componenttestwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_14">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_16">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -559,6 +585,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -559,6 +585,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
559 <extends>QLabel</extends> 585 <extends>QLabel</extends>
560 <header>digitalclock.h</header> 586 <header>digitalclock.h</header>
561 </customwidget> 587 </customwidget>
  588 + <customwidget>
  589 + <class>IgnitionIcon</class>
  590 + <extends>QLabel</extends>
  591 + <header>ignitionicon.h</header>
  592 + </customwidget>
  593 + <customwidget>
  594 + <class>WaterLevelIcon</class>
  595 + <extends>QLabel</extends>
  596 + <header>waterlevelicon.h</header>
  597 + </customwidget>
562 </customwidgets> 598 </customwidgets>
563 <resources> 599 <resources>
564 <include location="resources.qrc"/> 600 <include location="resources.qrc"/>
app/gui/oven_control/configdoormonitoring.ui
  Diff comments   View file @5f017a9
@@ -52,6 +52,32 @@ @@ -52,6 +52,32 @@
52 </rect> 52 </rect>
53 </property> 53 </property>
54 </widget> 54 </widget>
  55 + <widget class="WaterLevelIcon" name="label_13">
  56 + <property name="geometry">
  57 + <rect>
  58 + <x>670</x>
  59 + <y>290</y>
  60 + <width>111</width>
  61 + <height>121</height>
  62 + </rect>
  63 + </property>
  64 + <property name="text">
  65 + <string/>
  66 + </property>
  67 + </widget>
  68 + <widget class="IgnitionIcon" name="label_14">
  69 + <property name="geometry">
  70 + <rect>
  71 + <x>662</x>
  72 + <y>164</y>
  73 + <width>111</width>
  74 + <height>121</height>
  75 + </rect>
  76 + </property>
  77 + <property name="text">
  78 + <string/>
  79 + </property>
  80 + </widget>
55 </widget> 81 </widget>
56 <widget class="QWidget" name="page_2"/> 82 <widget class="QWidget" name="page_2"/>
57 </widget> 83 </widget>
@@ -539,6 +565,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h @@ -539,6 +565,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
539 <extends>QLabel</extends> 565 <extends>QLabel</extends>
540 <header>washwarnicon.h</header> 566 <header>washwarnicon.h</header>
541 </customwidget> 567 </customwidget>
  568 + <customwidget>
  569 + <class>IgnitionIcon</class>
  570 + <extends>QLabel</extends>
  571 + <header>ignitionicon.h</header>
  572 + </customwidget>
  573 + <customwidget>
  574 + <class>WaterLevelIcon</class>
  575 + <extends>QLabel</extends>
  576 + <header>waterlevelicon.h</header>
  577 + </customwidget>
542 </customwidgets> 578 </customwidgets>
543 <resources/> 579 <resources/>
544 <connections/> 580 <connections/>
app/gui/oven_control/configwindow.ui
  Diff comments   View file @5f017a9
@@ -120,6 +120,32 @@ background: none; @@ -120,6 +120,32 @@ background: none;
120 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 120 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
121 </property> 121 </property>
122 </widget> 122 </widget>
  123 + <widget class="WaterLevelIcon" name="label_6">
  124 + <property name="geometry">
  125 + <rect>
  126 + <x>670</x>
  127 + <y>290</y>
  128 + <width>111</width>
  129 + <height>121</height>
  130 + </rect>
  131 + </property>
  132 + <property name="text">
  133 + <string/>
  134 + </property>
  135 + </widget>
  136 + <widget class="IgnitionIcon" name="label_5">
  137 + <property name="geometry">
  138 + <rect>
  139 + <x>662</x>
  140 + <y>164</y>
  141 + <width>111</width>
  142 + <height>121</height>
  143 + </rect>
  144 + </property>
  145 + <property name="text">
  146 + <string/>
  147 + </property>
  148 + </widget>
123 </widget> 149 </widget>
124 <widget class="QWidget" name="page_2"/> 150 <widget class="QWidget" name="page_2"/>
125 </widget> 151 </widget>
@@ -608,6 +634,16 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/ @@ -608,6 +634,16 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/
608 <extends>QLabel</extends> 634 <extends>QLabel</extends>
609 <header>digitalclock.h</header> 635 <header>digitalclock.h</header>
610 </customwidget> 636 </customwidget>
  637 + <customwidget>
  638 + <class>IgnitionIcon</class>
  639 + <extends>QLabel</extends>
  640 + <header>ignitionicon.h</header>
  641 + </customwidget>
  642 + <customwidget>
  643 + <class>WaterLevelIcon</class>
  644 + <extends>QLabel</extends>
  645 + <header>waterlevelicon.h</header>
  646 + </customwidget>
611 </customwidgets> 647 </customwidgets>
612 <tabstops> 648 <tabstops>
613 <tabstop>pushButton</tabstop> 649 <tabstop>pushButton</tabstop>
app/gui/oven_control/electricmodelsettingwindow.ui
  Diff comments   View file @5f017a9
@@ -515,6 +515,32 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( @@ -515,6 +515,32 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(
515 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 515 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
516 </property> 516 </property>
517 </widget> 517 </widget>
  518 + <widget class="WaterLevelIcon" name="label_6">
  519 + <property name="geometry">
  520 + <rect>
  521 + <x>670</x>
  522 + <y>290</y>
  523 + <width>111</width>
  524 + <height>121</height>
  525 + </rect>
  526 + </property>
  527 + <property name="text">
  528 + <string/>
  529 + </property>
  530 + </widget>
  531 + <widget class="IgnitionIcon" name="label_5">
  532 + <property name="geometry">
  533 + <rect>
  534 + <x>662</x>
  535 + <y>164</y>
  536 + <width>111</width>
  537 + <height>121</height>
  538 + </rect>
  539 + </property>
  540 + <property name="text">
  541 + <string/>
  542 + </property>
  543 + </widget>
518 </widget> 544 </widget>
519 <widget class="QWidget" name="page_2"/> 545 <widget class="QWidget" name="page_2"/>
520 </widget> 546 </widget>
@@ -547,6 +573,16 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( @@ -547,6 +573,16 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(
547 <extends>QLabel</extends> 573 <extends>QLabel</extends>
548 <header>digitalclock.h</header> 574 <header>digitalclock.h</header>
549 </customwidget> 575 </customwidget>
  576 + <customwidget>
  577 + <class>IgnitionIcon</class>
  578 + <extends>QLabel</extends>
  579 + <header>ignitionicon.h</header>
  580 + </customwidget>
  581 + <customwidget>
  582 + <class>WaterLevelIcon</class>
  583 + <extends>QLabel</extends>
  584 + <header>waterlevelicon.h</header>
  585 + </customwidget>
550 </customwidgets> 586 </customwidgets>
551 <tabstops> 587 <tabstops>
552 <tabstop>e10Button</tabstop> 588 <tabstop>e10Button</tabstop>
app/gui/oven_control/engineermenuwindow.ui
  Diff comments   View file @5f017a9
@@ -84,6 +84,32 @@ @@ -84,6 +84,32 @@
84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
85 </property> 85 </property>
86 </widget> 86 </widget>
  87 + <widget class="WaterLevelIcon" name="label_6">
  88 + <property name="geometry">
  89 + <rect>
  90 + <x>670</x>
  91 + <y>290</y>
  92 + <width>111</width>
  93 + <height>121</height>
  94 + </rect>
  95 + </property>
  96 + <property name="text">
  97 + <string/>
  98 + </property>
  99 + </widget>
  100 + <widget class="IgnitionIcon" name="label_5">
  101 + <property name="geometry">
  102 + <rect>
  103 + <x>662</x>
  104 + <y>164</y>
  105 + <width>111</width>
  106 + <height>121</height>
  107 + </rect>
  108 + </property>
  109 + <property name="text">
  110 + <string/>
  111 + </property>
  112 + </widget>
87 </widget> 113 </widget>
88 <widget class="QWidget" name="page_2"/> 114 <widget class="QWidget" name="page_2"/>
89 </widget> 115 </widget>
@@ -660,6 +686,16 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}&lt;/st @@ -660,6 +686,16 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}&lt;/st
660 <extends>QLabel</extends> 686 <extends>QLabel</extends>
661 <header>digitalclock.h</header> 687 <header>digitalclock.h</header>
662 </customwidget> 688 </customwidget>
  689 + <customwidget>
  690 + <class>IgnitionIcon</class>
  691 + <extends>QLabel</extends>
  692 + <header>ignitionicon.h</header>
  693 + </customwidget>
  694 + <customwidget>
  695 + <class>WaterLevelIcon</class>
  696 + <extends>QLabel</extends>
  697 + <header>waterlevelicon.h</header>
  698 + </customwidget>
663 </customwidgets> 699 </customwidgets>
664 <tabstops> 700 <tabstops>
665 <tabstop>engAdjustButton</tabstop> 701 <tabstop>engAdjustButton</tabstop>
app/gui/oven_control/fantestwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_10">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_11">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -798,6 +824,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -798,6 +824,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
798 <extends>QLabel</extends> 824 <extends>QLabel</extends>
799 <header>digitalclock.h</header> 825 <header>digitalclock.h</header>
800 </customwidget> 826 </customwidget>
  827 + <customwidget>
  828 + <class>IgnitionIcon</class>
  829 + <extends>QLabel</extends>
  830 + <header>ignitionicon.h</header>
  831 + </customwidget>
  832 + <customwidget>
  833 + <class>WaterLevelIcon</class>
  834 + <extends>QLabel</extends>
  835 + <header>waterlevelicon.h</header>
  836 + </customwidget>
801 </customwidgets> 837 </customwidgets>
802 <resources> 838 <resources>
803 <include location="resources.qrc"/> 839 <include location="resources.qrc"/>
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @5f017a9
@@ -87,6 +87,32 @@ @@ -87,6 +87,32 @@
87 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 87 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
88 </property> 88 </property>
89 </widget> 89 </widget>
  90 + <widget class="WaterLevelIcon" name="label_6">
  91 + <property name="geometry">
  92 + <rect>
  93 + <x>670</x>
  94 + <y>290</y>
  95 + <width>111</width>
  96 + <height>121</height>
  97 + </rect>
  98 + </property>
  99 + <property name="text">
  100 + <string/>
  101 + </property>
  102 + </widget>
  103 + <widget class="IgnitionIcon" name="label_5">
  104 + <property name="geometry">
  105 + <rect>
  106 + <x>662</x>
  107 + <y>164</y>
  108 + <width>111</width>
  109 + <height>121</height>
  110 + </rect>
  111 + </property>
  112 + <property name="text">
  113 + <string/>
  114 + </property>
  115 + </widget>
90 </widget> 116 </widget>
91 <widget class="QWidget" name="page_2"/> 117 <widget class="QWidget" name="page_2"/>
92 </widget> 118 </widget>
@@ -838,6 +864,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o @@ -838,6 +864,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
838 <extends>QLabel</extends> 864 <extends>QLabel</extends>
839 <header>digitalclock.h</header> 865 <header>digitalclock.h</header>
840 </customwidget> 866 </customwidget>
  867 + <customwidget>
  868 + <class>IgnitionIcon</class>
  869 + <extends>QLabel</extends>
  870 + <header>ignitionicon.h</header>
  871 + </customwidget>
  872 + <customwidget>
  873 + <class>WaterLevelIcon</class>
  874 + <extends>QLabel</extends>
  875 + <header>waterlevelicon.h</header>
  876 + </customwidget>
841 </customwidgets> 877 </customwidgets>
842 <resources/> 878 <resources/>
843 <connections/> 879 <connections/>
app/gui/oven_control/gasmodelsettingwindow.ui
  Diff comments   View file @5f017a9
@@ -615,6 +615,32 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url @@ -615,6 +615,32 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url
615 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 615 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
616 </property> 616 </property>
617 </widget> 617 </widget>
  618 + <widget class="WaterLevelIcon" name="label_6">
  619 + <property name="geometry">
  620 + <rect>
  621 + <x>670</x>
  622 + <y>290</y>
  623 + <width>111</width>
  624 + <height>121</height>
  625 + </rect>
  626 + </property>
  627 + <property name="text">
  628 + <string/>
  629 + </property>
  630 + </widget>
  631 + <widget class="IgnitionIcon" name="label_5">
  632 + <property name="geometry">
  633 + <rect>
  634 + <x>662</x>
  635 + <y>164</y>
  636 + <width>111</width>
  637 + <height>121</height>
  638 + </rect>
  639 + </property>
  640 + <property name="text">
  641 + <string/>
  642 + </property>
  643 + </widget>
618 </widget> 644 </widget>
619 <widget class="QWidget" name="page_2"/> 645 <widget class="QWidget" name="page_2"/>
620 </widget> 646 </widget>
@@ -747,6 +773,16 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url @@ -747,6 +773,16 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url
747 <extends>QLabel</extends> 773 <extends>QLabel</extends>
748 <header>digitalclock.h</header> 774 <header>digitalclock.h</header>
749 </customwidget> 775 </customwidget>
  776 + <customwidget>
  777 + <class>IgnitionIcon</class>
  778 + <extends>QLabel</extends>
  779 + <header>ignitionicon.h</header>
  780 + </customwidget>
  781 + <customwidget>
  782 + <class>WaterLevelIcon</class>
  783 + <extends>QLabel</extends>
  784 + <header>waterlevelicon.h</header>
  785 + </customwidget>
750 </customwidgets> 786 </customwidgets>
751 <tabstops> 787 <tabstops>
752 <tabstop>lpg10Button</tabstop> 788 <tabstop>lpg10Button</tabstop>
app/gui/oven_control/gastestwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_7">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_5">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -536,6 +562,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -536,6 +562,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
536 <extends>QLabel</extends> 562 <extends>QLabel</extends>
537 <header>digitalclock.h</header> 563 <header>digitalclock.h</header>
538 </customwidget> 564 </customwidget>
  565 + <customwidget>
  566 + <class>IgnitionIcon</class>
  567 + <extends>QLabel</extends>
  568 + <header>ignitionicon.h</header>
  569 + </customwidget>
  570 + <customwidget>
  571 + <class>WaterLevelIcon</class>
  572 + <extends>QLabel</extends>
  573 + <header>waterlevelicon.h</header>
  574 + </customwidget>
539 </customwidgets> 575 </customwidgets>
540 <resources> 576 <resources>
541 <include location="resources.qrc"/> 577 <include location="resources.qrc"/>
app/gui/oven_control/historylistwindow.ui
  Diff comments   View file @5f017a9
@@ -239,6 +239,32 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 @@ -239,6 +239,32 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0
239 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 239 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
240 </property> 240 </property>
241 </widget> 241 </widget>
  242 + <widget class="WaterLevelIcon" name="label_9">
  243 + <property name="geometry">
  244 + <rect>
  245 + <x>670</x>
  246 + <y>290</y>
  247 + <width>111</width>
  248 + <height>121</height>
  249 + </rect>
  250 + </property>
  251 + <property name="text">
  252 + <string/>
  253 + </property>
  254 + </widget>
  255 + <widget class="IgnitionIcon" name="label_10">
  256 + <property name="geometry">
  257 + <rect>
  258 + <x>662</x>
  259 + <y>164</y>
  260 + <width>111</width>
  261 + <height>121</height>
  262 + </rect>
  263 + </property>
  264 + <property name="text">
  265 + <string/>
  266 + </property>
  267 + </widget>
242 </widget> 268 </widget>
243 <widget class="QWidget" name="page_2"/> 269 <widget class="QWidget" name="page_2"/>
244 </widget> 270 </widget>
@@ -1468,6 +1494,16 @@ QPushButton { text-align:center;}&lt;/string&gt; @@ -1468,6 +1494,16 @@ QPushButton { text-align:center;}&lt;/string&gt;
1468 <extends>QLabel</extends> 1494 <extends>QLabel</extends>
1469 <header>digitalclock.h</header> 1495 <header>digitalclock.h</header>
1470 </customwidget> 1496 </customwidget>
  1497 + <customwidget>
  1498 + <class>IgnitionIcon</class>
  1499 + <extends>QLabel</extends>
  1500 + <header>ignitionicon.h</header>
  1501 + </customwidget>
  1502 + <customwidget>
  1503 + <class>WaterLevelIcon</class>
  1504 + <extends>QLabel</extends>
  1505 + <header>waterlevelicon.h</header>
  1506 + </customwidget>
1471 </customwidgets> 1507 </customwidgets>
1472 <resources/> 1508 <resources/>
1473 <connections/> 1509 <connections/>
app/gui/oven_control/ignitionicon.cpp
  Diff comments   View file @5f017a9
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
  1 +#include "ignitionicon.h"
  2 +
  3 +#include "udphandler.h"
  4 +
  5 +QPixmap *IgnitionIcon::icon = Q_NULLPTR;
  6 +
  7 +IgnitionIcon::IgnitionIcon(QWidget *parent) : QLabel(parent)
  8 +{
  9 + if (icon == Q_NULLPTR)
  10 + icon = new QPixmap(":/images/symbol/inigited.png");
  11 +
  12 + connect(&timer, SIGNAL(timeout()), SLOT(check()));
  13 + timer.start(1000);
  14 +
  15 + setPixmap(*icon);
  16 +
  17 + check();
  18 +}
  19 +
  20 +void IgnitionIcon::check()
  21 +{
  22 + UdpHandler *udp = UdpHandler::getInstance();
  23 + if (udp->burnerState(1) || udp->burnerState(2) || udp->burnerState(3))
  24 + show();
  25 + else
  26 + hide();
  27 +}
app/gui/oven_control/ignitionicon.h
  Diff comments   View file @5f017a9
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +#ifndef IGNITIONICON_H
  2 +#define IGNITIONICON_H
  3 +
  4 +#include <QLabel>
  5 +#include <QTimer>
  6 +
  7 +class IgnitionIcon : public QLabel
  8 +{
  9 + Q_OBJECT
  10 +
  11 + static QPixmap *icon;
  12 + QTimer timer;
  13 +
  14 +public:
  15 + explicit IgnitionIcon(QWidget *parent = Q_NULLPTR);
  16 +
  17 +private slots:
  18 + void check();
  19 +};
  20 +
  21 +#endif // IGNITIONICON_H
app/gui/oven_control/images/symbol/ignited.png
  Diff comments   View file @5f017a9

5.62 KB
app/gui/oven_control/images/symbol/water_level_high.png
  Diff comments   View file @5f017a9

4.53 KB
app/gui/oven_control/images/symbol/water_level_low.png
  Diff comments   View file @5f017a9

2.78 KB
app/gui/oven_control/images/symbol/water_level_middle.png
  Diff comments   View file @5f017a9

3.73 KB
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @5f017a9
@@ -642,6 +642,32 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ @@ -642,6 +642,32 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
642 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 642 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
643 </property> 643 </property>
644 </widget> 644 </widget>
  645 + <widget class="IgnitionIcon" name="label_5">
  646 + <property name="geometry">
  647 + <rect>
  648 + <x>662</x>
  649 + <y>164</y>
  650 + <width>111</width>
  651 + <height>121</height>
  652 + </rect>
  653 + </property>
  654 + <property name="text">
  655 + <string/>
  656 + </property>
  657 + </widget>
  658 + <widget class="WaterLevelIcon" name="label_6">
  659 + <property name="geometry">
  660 + <rect>
  661 + <x>670</x>
  662 + <y>290</y>
  663 + <width>111</width>
  664 + <height>121</height>
  665 + </rect>
  666 + </property>
  667 + <property name="text">
  668 + <string/>
  669 + </property>
  670 + </widget>
645 </widget> 671 </widget>
646 <widget class="Line" name="line_7"> 672 <widget class="Line" name="line_7">
647 <property name="geometry"> 673 <property name="geometry">
@@ -729,6 +755,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ @@ -729,6 +755,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
729 <extends>QLabel</extends> 755 <extends>QLabel</extends>
730 <header>digitalclock.h</header> 756 <header>digitalclock.h</header>
731 </customwidget> 757 </customwidget>
  758 + <customwidget>
  759 + <class>IgnitionIcon</class>
  760 + <extends>QLabel</extends>
  761 + <header>ignitionicon.h</header>
  762 + </customwidget>
  763 + <customwidget>
  764 + <class>WaterLevelIcon</class>
  765 + <extends>QLabel</extends>
  766 + <header>waterlevelicon.h</header>
  767 + </customwidget>
732 </customwidgets> 768 </customwidgets>
733 <tabstops> 769 <tabstops>
734 <tabstop>steamButton</tabstop> 770 <tabstop>steamButton</tabstop>
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @5f017a9
@@ -131,6 +131,32 @@ height: 33px; @@ -131,6 +131,32 @@ height: 33px;
131 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 131 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
132 </property> 132 </property>
133 </widget> 133 </widget>
  134 + <widget class="WaterLevelIcon" name="label_8">
  135 + <property name="geometry">
  136 + <rect>
  137 + <x>670</x>
  138 + <y>290</y>
  139 + <width>111</width>
  140 + <height>121</height>
  141 + </rect>
  142 + </property>
  143 + <property name="text">
  144 + <string/>
  145 + </property>
  146 + </widget>
  147 + <widget class="IgnitionIcon" name="label_9">
  148 + <property name="geometry">
  149 + <rect>
  150 + <x>662</x>
  151 + <y>164</y>
  152 + <width>111</width>
  153 + <height>121</height>
  154 + </rect>
  155 + </property>
  156 + <property name="text">
  157 + <string/>
  158 + </property>
  159 + </widget>
134 </widget> 160 </widget>
135 <widget class="QWidget" name="closeDoorWidget"> 161 <widget class="QWidget" name="closeDoorWidget">
136 <property name="styleSheet"> 162 <property name="styleSheet">
@@ -1333,14 +1359,19 @@ QPushButton:checked:focus @@ -1333,14 +1359,19 @@ QPushButton:checked:focus
1333 <header>halfenergyicon.h</header> 1359 <header>halfenergyicon.h</header>
1334 </customwidget> 1360 </customwidget>
1335 <customwidget> 1361 <customwidget>
1336 - <class>AnimatedImageBox</class> 1362 + <class>DigitalClock</class>
1337 <extends>QLabel</extends> 1363 <extends>QLabel</extends>
1338 - <header>animatedimagebox.h</header> 1364 + <header>digitalclock.h</header>
1339 </customwidget> 1365 </customwidget>
1340 <customwidget> 1366 <customwidget>
1341 - <class>DigitalClock</class> 1367 + <class>IgnitionIcon</class>
1342 <extends>QLabel</extends> 1368 <extends>QLabel</extends>
1343 - <header>digitalclock.h</header> 1369 + <header>ignitionicon.h</header>
  1370 + </customwidget>
  1371 + <customwidget>
  1372 + <class>WaterLevelIcon</class>
  1373 + <extends>QLabel</extends>
  1374 + <header>waterlevelicon.h</header>
1344 </customwidget> 1375 </customwidget>
1345 <customwidget> 1376 <customwidget>
1346 <class>Slider</class> 1377 <class>Slider</class>
@@ -1348,6 +1379,11 @@ QPushButton:checked:focus @@ -1348,6 +1379,11 @@ QPushButton:checked:focus
1348 <header>slider.h</header> 1379 <header>slider.h</header>
1349 <container>1</container> 1380 <container>1</container>
1350 </customwidget> 1381 </customwidget>
  1382 + <customwidget>
  1383 + <class>AnimatedImageBox</class>
  1384 + <extends>QLabel</extends>
  1385 + <header>animatedimagebox.h</header>
  1386 + </customwidget>
1351 </customwidgets> 1387 </customwidgets>
1352 <tabstops> 1388 <tabstops>
1353 <tabstop>steamButton</tabstop> 1389 <tabstop>steamButton</tabstop>
app/gui/oven_control/modelsettingwindow.ui
  Diff comments   View file @5f017a9
@@ -403,6 +403,32 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o @@ -403,6 +403,32 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
403 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 403 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
404 </property> 404 </property>
405 </widget> 405 </widget>
  406 + <widget class="WaterLevelIcon" name="label_6">
  407 + <property name="geometry">
  408 + <rect>
  409 + <x>670</x>
  410 + <y>290</y>
  411 + <width>111</width>
  412 + <height>121</height>
  413 + </rect>
  414 + </property>
  415 + <property name="text">
  416 + <string/>
  417 + </property>
  418 + </widget>
  419 + <widget class="IgnitionIcon" name="label_5">
  420 + <property name="geometry">
  421 + <rect>
  422 + <x>662</x>
  423 + <y>164</y>
  424 + <width>111</width>
  425 + <height>121</height>
  426 + </rect>
  427 + </property>
  428 + <property name="text">
  429 + <string/>
  430 + </property>
  431 + </widget>
406 </widget> 432 </widget>
407 <widget class="QWidget" name="page_2"/> 433 <widget class="QWidget" name="page_2"/>
408 </widget> 434 </widget>
@@ -435,6 +461,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o @@ -435,6 +461,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
435 <extends>QLabel</extends> 461 <extends>QLabel</extends>
436 <header>digitalclock.h</header> 462 <header>digitalclock.h</header>
437 </customwidget> 463 </customwidget>
  464 + <customwidget>
  465 + <class>IgnitionIcon</class>
  466 + <extends>QLabel</extends>
  467 + <header>ignitionicon.h</header>
  468 + </customwidget>
  469 + <customwidget>
  470 + <class>WaterLevelIcon</class>
  471 + <extends>QLabel</extends>
  472 + <header>waterlevelicon.h</header>
  473 + </customwidget>
438 </customwidgets> 474 </customwidgets>
439 <resources/> 475 <resources/>
440 <connections/> 476 <connections/>
app/gui/oven_control/multicookautowindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_6">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_5">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -188,6 +214,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h @@ -188,6 +214,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
188 <extends>QLabel</extends> 214 <extends>QLabel</extends>
189 <header>digitalclock.h</header> 215 <header>digitalclock.h</header>
190 </customwidget> 216 </customwidget>
  217 + <customwidget>
  218 + <class>IgnitionIcon</class>
  219 + <extends>QLabel</extends>
  220 + <header>ignitionicon.h</header>
  221 + </customwidget>
  222 + <customwidget>
  223 + <class>WaterLevelIcon</class>
  224 + <extends>QLabel</extends>
  225 + <header>waterlevelicon.h</header>
  226 + </customwidget>
191 </customwidgets> 227 </customwidgets>
192 <resources/> 228 <resources/>
193 <connections/> 229 <connections/>
app/gui/oven_control/multicookmanualwindow.ui
  Diff comments   View file @5f017a9
@@ -778,6 +778,32 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); } @@ -778,6 +778,32 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); }
778 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 778 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
779 </property> 779 </property>
780 </widget> 780 </widget>
  781 + <widget class="WaterLevelIcon" name="label_7">
  782 + <property name="geometry">
  783 + <rect>
  784 + <x>670</x>
  785 + <y>290</y>
  786 + <width>111</width>
  787 + <height>121</height>
  788 + </rect>
  789 + </property>
  790 + <property name="text">
  791 + <string/>
  792 + </property>
  793 + </widget>
  794 + <widget class="IgnitionIcon" name="label_8">
  795 + <property name="geometry">
  796 + <rect>
  797 + <x>662</x>
  798 + <y>164</y>
  799 + <width>111</width>
  800 + <height>121</height>
  801 + </rect>
  802 + </property>
  803 + <property name="text">
  804 + <string/>
  805 + </property>
  806 + </widget>
781 </widget> 807 </widget>
782 <widget class="QWidget" name="closeDoorWidget"> 808 <widget class="QWidget" name="closeDoorWidget">
783 <property name="styleSheet"> 809 <property name="styleSheet">
@@ -873,9 +899,14 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }&lt;/string&gt; @@ -873,9 +899,14 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }&lt;/string&gt;
873 <header>digitalclock.h</header> 899 <header>digitalclock.h</header>
874 </customwidget> 900 </customwidget>
875 <customwidget> 901 <customwidget>
876 - <class>AnimatedImageBox</class> 902 + <class>IgnitionIcon</class>
877 <extends>QLabel</extends> 903 <extends>QLabel</extends>
878 - <header>animatedimagebox.h</header> 904 + <header>ignitionicon.h</header>
  905 + </customwidget>
  906 + <customwidget>
  907 + <class>WaterLevelIcon</class>
  908 + <extends>QLabel</extends>
  909 + <header>waterlevelicon.h</header>
879 </customwidget> 910 </customwidget>
880 <customwidget> 911 <customwidget>
881 <class>Slider</class> 912 <class>Slider</class>
@@ -883,6 +914,11 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }&lt;/string&gt; @@ -883,6 +914,11 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }&lt;/string&gt;
883 <header>slider.h</header> 914 <header>slider.h</header>
884 <container>1</container> 915 <container>1</container>
885 </customwidget> 916 </customwidget>
  917 + <customwidget>
  918 + <class>AnimatedImageBox</class>
  919 + <extends>QLabel</extends>
  920 + <header>animatedimagebox.h</header>
  921 + </customwidget>
886 </customwidgets> 922 </customwidgets>
887 <tabstops> 923 <tabstops>
888 <tabstop>steamButton</tabstop> 924 <tabstop>steamButton</tabstop>
app/gui/oven_control/multicookwindow.ui
  Diff comments   View file @5f017a9
@@ -504,6 +504,32 @@ QPushButton:focus @@ -504,6 +504,32 @@ QPushButton:focus
504 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 504 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
505 </property> 505 </property>
506 </widget> 506 </widget>
  507 + <widget class="WaterLevelIcon" name="label_11">
  508 + <property name="geometry">
  509 + <rect>
  510 + <x>670</x>
  511 + <y>290</y>
  512 + <width>111</width>
  513 + <height>121</height>
  514 + </rect>
  515 + </property>
  516 + <property name="text">
  517 + <string/>
  518 + </property>
  519 + </widget>
  520 + <widget class="IgnitionIcon" name="label_12">
  521 + <property name="geometry">
  522 + <rect>
  523 + <x>662</x>
  524 + <y>164</y>
  525 + <width>111</width>
  526 + <height>121</height>
  527 + </rect>
  528 + </property>
  529 + <property name="text">
  530 + <string/>
  531 + </property>
  532 + </widget>
507 </widget> 533 </widget>
508 <widget class="QWidget" name="recentsContainer"> 534 <widget class="QWidget" name="recentsContainer">
509 <property name="styleSheet"> 535 <property name="styleSheet">
@@ -1224,26 +1250,36 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 @@ -1224,26 +1250,36 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
1224 <header>digitalclock.h</header> 1250 <header>digitalclock.h</header>
1225 </customwidget> 1251 </customwidget>
1226 <customwidget> 1252 <customwidget>
  1253 + <class>IgnitionIcon</class>
  1254 + <extends>QLabel</extends>
  1255 + <header>ignitionicon.h</header>
  1256 + </customwidget>
  1257 + <customwidget>
  1258 + <class>WaterLevelIcon</class>
  1259 + <extends>QLabel</extends>
  1260 + <header>waterlevelicon.h</header>
  1261 + </customwidget>
  1262 + <customwidget>
1227 <class>AnimatedImageBox</class> 1263 <class>AnimatedImageBox</class>
1228 <extends>QLabel</extends> 1264 <extends>QLabel</extends>
1229 <header>animatedimagebox.h</header> 1265 <header>animatedimagebox.h</header>
1230 </customwidget> 1266 </customwidget>
1231 <customwidget> 1267 <customwidget>
1232 - <class>MultiCookView</class> 1268 + <class>BulletIndicator</class>
1233 <extends>QWidget</extends> 1269 <extends>QWidget</extends>
1234 - <header>multicookview.h</header> 1270 + <header>bulletindicator.h</header>
1235 <container>1</container> 1271 <container>1</container>
1236 </customwidget> 1272 </customwidget>
1237 <customwidget> 1273 <customwidget>
1238 - <class>MultiCookTimeBar</class> 1274 + <class>MultiCookView</class>
1239 <extends>QWidget</extends> 1275 <extends>QWidget</extends>
1240 - <header>multicooktimebar.h</header> 1276 + <header>multicookview.h</header>
1241 <container>1</container> 1277 <container>1</container>
1242 </customwidget> 1278 </customwidget>
1243 <customwidget> 1279 <customwidget>
1244 - <class>BulletIndicator</class> 1280 + <class>MultiCookTimeBar</class>
1245 <extends>QWidget</extends> 1281 <extends>QWidget</extends>
1246 - <header>bulletindicator.h</header> 1282 + <header>multicooktimebar.h</header>
1247 <container>1</container> 1283 <container>1</container>
1248 </customwidget> 1284 </customwidget>
1249 </customwidgets> 1285 </customwidgets>
app/gui/oven_control/operationtimeheat.ui
  Diff comments   View file @5f017a9
@@ -85,6 +85,32 @@ @@ -85,6 +85,32 @@
85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
86 </property> 86 </property>
87 </widget> 87 </widget>
  88 + <widget class="WaterLevelIcon" name="label_6">
  89 + <property name="geometry">
  90 + <rect>
  91 + <x>670</x>
  92 + <y>290</y>
  93 + <width>111</width>
  94 + <height>121</height>
  95 + </rect>
  96 + </property>
  97 + <property name="text">
  98 + <string/>
  99 + </property>
  100 + </widget>
  101 + <widget class="IgnitionIcon" name="label_5">
  102 + <property name="geometry">
  103 + <rect>
  104 + <x>662</x>
  105 + <y>164</y>
  106 + <width>111</width>
  107 + <height>121</height>
  108 + </rect>
  109 + </property>
  110 + <property name="text">
  111 + <string/>
  112 + </property>
  113 + </widget>
88 </widget> 114 </widget>
89 <widget class="QWidget" name="page_2"/> 115 <widget class="QWidget" name="page_2"/>
90 </widget> 116 </widget>
@@ -412,6 +438,16 @@ QPushButton { text-align: center;} @@ -412,6 +438,16 @@ QPushButton { text-align: center;}
412 <extends>QLabel</extends> 438 <extends>QLabel</extends>
413 <header>digitalclock.h</header> 439 <header>digitalclock.h</header>
414 </customwidget> 440 </customwidget>
  441 + <customwidget>
  442 + <class>IgnitionIcon</class>
  443 + <extends>QLabel</extends>
  444 + <header>ignitionicon.h</header>
  445 + </customwidget>
  446 + <customwidget>
  447 + <class>WaterLevelIcon</class>
  448 + <extends>QLabel</extends>
  449 + <header>waterlevelicon.h</header>
  450 + </customwidget>
415 </customwidgets> 451 </customwidgets>
416 <resources/> 452 <resources/>
417 <connections/> 453 <connections/>
app/gui/oven_control/operationtimemain.ui
  Diff comments   View file @5f017a9
@@ -84,6 +84,32 @@ @@ -84,6 +84,32 @@
84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
85 </property> 85 </property>
86 </widget> 86 </widget>
  87 + <widget class="WaterLevelIcon" name="label_6">
  88 + <property name="geometry">
  89 + <rect>
  90 + <x>670</x>
  91 + <y>290</y>
  92 + <width>111</width>
  93 + <height>121</height>
  94 + </rect>
  95 + </property>
  96 + <property name="text">
  97 + <string/>
  98 + </property>
  99 + </widget>
  100 + <widget class="IgnitionIcon" name="label_7">
  101 + <property name="geometry">
  102 + <rect>
  103 + <x>662</x>
  104 + <y>164</y>
  105 + <width>111</width>
  106 + <height>121</height>
  107 + </rect>
  108 + </property>
  109 + <property name="text">
  110 + <string/>
  111 + </property>
  112 + </widget>
87 </widget> 113 </widget>
88 <widget class="QWidget" name="page_2"/> 114 <widget class="QWidget" name="page_2"/>
89 </widget> 115 </widget>
@@ -376,6 +402,16 @@ QPushButton { text-align: center;} @@ -376,6 +402,16 @@ QPushButton { text-align: center;}
376 <extends>QLabel</extends> 402 <extends>QLabel</extends>
377 <header>digitalclock.h</header> 403 <header>digitalclock.h</header>
378 </customwidget> 404 </customwidget>
  405 + <customwidget>
  406 + <class>IgnitionIcon</class>
  407 + <extends>QLabel</extends>
  408 + <header>ignitionicon.h</header>
  409 + </customwidget>
  410 + <customwidget>
  411 + <class>WaterLevelIcon</class>
  412 + <extends>QLabel</extends>
  413 + <header>waterlevelicon.h</header>
  414 + </customwidget>
379 </customwidgets> 415 </customwidgets>
380 <resources> 416 <resources>
381 <include location="resources.qrc"/> 417 <include location="resources.qrc"/>
app/gui/oven_control/operationtimemode.ui
  Diff comments   View file @5f017a9
@@ -85,6 +85,32 @@ @@ -85,6 +85,32 @@
85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
86 </property> 86 </property>
87 </widget> 87 </widget>
  88 + <widget class="WaterLevelIcon" name="label_6">
  89 + <property name="geometry">
  90 + <rect>
  91 + <x>670</x>
  92 + <y>290</y>
  93 + <width>111</width>
  94 + <height>121</height>
  95 + </rect>
  96 + </property>
  97 + <property name="text">
  98 + <string/>
  99 + </property>
  100 + </widget>
  101 + <widget class="IgnitionIcon" name="label_5">
  102 + <property name="geometry">
  103 + <rect>
  104 + <x>662</x>
  105 + <y>164</y>
  106 + <width>111</width>
  107 + <height>121</height>
  108 + </rect>
  109 + </property>
  110 + <property name="text">
  111 + <string/>
  112 + </property>
  113 + </widget>
88 </widget> 114 </widget>
89 <widget class="QWidget" name="page_2"/> 115 <widget class="QWidget" name="page_2"/>
90 </widget> 116 </widget>
@@ -832,6 +858,16 @@ QPushButton { text-align: center;} @@ -832,6 +858,16 @@ QPushButton { text-align: center;}
832 <extends>QLabel</extends> 858 <extends>QLabel</extends>
833 <header>digitalclock.h</header> 859 <header>digitalclock.h</header>
834 </customwidget> 860 </customwidget>
  861 + <customwidget>
  862 + <class>IgnitionIcon</class>
  863 + <extends>QLabel</extends>
  864 + <header>ignitionicon.h</header>
  865 + </customwidget>
  866 + <customwidget>
  867 + <class>WaterLevelIcon</class>
  868 + <extends>QLabel</extends>
  869 + <header>waterlevelicon.h</header>
  870 + </customwidget>
835 </customwidgets> 871 </customwidgets>
836 <resources/> 872 <resources/>
837 <connections/> 873 <connections/>
app/gui/oven_control/operationtimeparts.ui
  Diff comments   View file @5f017a9
@@ -85,6 +85,32 @@ @@ -85,6 +85,32 @@
85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
86 </property> 86 </property>
87 </widget> 87 </widget>
  88 + <widget class="WaterLevelIcon" name="label_6">
  89 + <property name="geometry">
  90 + <rect>
  91 + <x>670</x>
  92 + <y>290</y>
  93 + <width>111</width>
  94 + <height>121</height>
  95 + </rect>
  96 + </property>
  97 + <property name="text">
  98 + <string/>
  99 + </property>
  100 + </widget>
  101 + <widget class="IgnitionIcon" name="label_5">
  102 + <property name="geometry">
  103 + <rect>
  104 + <x>662</x>
  105 + <y>164</y>
  106 + <width>111</width>
  107 + <height>121</height>
  108 + </rect>
  109 + </property>
  110 + <property name="text">
  111 + <string/>
  112 + </property>
  113 + </widget>
88 </widget> 114 </widget>
89 <widget class="QWidget" name="page_2"/> 115 <widget class="QWidget" name="page_2"/>
90 </widget> 116 </widget>
@@ -1105,6 +1131,16 @@ QPushButton { text-align: center;} @@ -1105,6 +1131,16 @@ QPushButton { text-align: center;}
1105 <extends>QLabel</extends> 1131 <extends>QLabel</extends>
1106 <header>digitalclock.h</header> 1132 <header>digitalclock.h</header>
1107 </customwidget> 1133 </customwidget>
  1134 + <customwidget>
  1135 + <class>IgnitionIcon</class>
  1136 + <extends>QLabel</extends>
  1137 + <header>ignitionicon.h</header>
  1138 + </customwidget>
  1139 + <customwidget>
  1140 + <class>WaterLevelIcon</class>
  1141 + <extends>QLabel</extends>
  1142 + <header>waterlevelicon.h</header>
  1143 + </customwidget>
1108 </customwidgets> 1144 </customwidgets>
1109 <resources/> 1145 <resources/>
1110 <connections/> 1146 <connections/>
app/gui/oven_control/oven_control.pro
  Diff comments   View file @5f017a9
@@ -146,7 +146,9 @@ SOURCES += main.cpp\ @@ -146,7 +146,9 @@ SOURCES += main.cpp\
146 canvas.cpp \ 146 canvas.cpp \
147 touchtestwindow.cpp \ 147 touchtestwindow.cpp \
148 haccpdownloaddlg.cpp \ 148 haccpdownloaddlg.cpp \
149 - flushwaterwindow.cpp 149 + flushwaterwindow.cpp \
  150 + ignitionicon.cpp \
  151 + waterlevelicon.cpp
150 152
151 153
152 HEADERS += mainwindow.h \ 154 HEADERS += mainwindow.h \
@@ -283,7 +285,9 @@ HEADERS += mainwindow.h \ @@ -283,7 +285,9 @@ HEADERS += mainwindow.h \
283 canvas.h \ 285 canvas.h \
284 touchtestwindow.h \ 286 touchtestwindow.h \
285 haccpdownloaddlg.h \ 287 haccpdownloaddlg.h \
286 - flushwaterwindow.h 288 + flushwaterwindow.h \
  289 + ignitionicon.h \
  290 + waterlevelicon.h
287 291
288 FORMS += mainwindow.ui \ 292 FORMS += mainwindow.ui \
289 manualcookwindow.ui \ 293 manualcookwindow.ui \
app/gui/oven_control/primewindow.ui
  Diff comments   View file @5f017a9
@@ -197,6 +197,32 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c @@ -197,6 +197,32 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
197 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 197 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
198 </property> 198 </property>
199 </widget> 199 </widget>
  200 + <widget class="WaterLevelIcon" name="label_6">
  201 + <property name="geometry">
  202 + <rect>
  203 + <x>670</x>
  204 + <y>290</y>
  205 + <width>111</width>
  206 + <height>121</height>
  207 + </rect>
  208 + </property>
  209 + <property name="text">
  210 + <string/>
  211 + </property>
  212 + </widget>
  213 + <widget class="IgnitionIcon" name="label_5">
  214 + <property name="geometry">
  215 + <rect>
  216 + <x>662</x>
  217 + <y>164</y>
  218 + <width>111</width>
  219 + <height>121</height>
  220 + </rect>
  221 + </property>
  222 + <property name="text">
  223 + <string/>
  224 + </property>
  225 + </widget>
200 </widget> 226 </widget>
201 <widget class="QWidget" name="page_2"/> 227 <widget class="QWidget" name="page_2"/>
202 </widget> 228 </widget>
@@ -356,6 +382,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main @@ -356,6 +382,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main
356 <extends>QLabel</extends> 382 <extends>QLabel</extends>
357 <header>digitalclock.h</header> 383 <header>digitalclock.h</header>
358 </customwidget> 384 </customwidget>
  385 + <customwidget>
  386 + <class>IgnitionIcon</class>
  387 + <extends>QLabel</extends>
  388 + <header>ignitionicon.h</header>
  389 + </customwidget>
  390 + <customwidget>
  391 + <class>WaterLevelIcon</class>
  392 + <extends>QLabel</extends>
  393 + <header>waterlevelicon.h</header>
  394 + </customwidget>
359 </customwidgets> 395 </customwidgets>
360 <tabstops> 396 <tabstops>
361 <tabstop>mostCookedButton</tabstop> 397 <tabstop>mostCookedButton</tabstop>
app/gui/oven_control/programmingautoconfigwindow.ui
  Diff comments   View file @5f017a9
@@ -562,6 +562,32 @@ border-image: url(:/images/button/288_ov.png); @@ -562,6 +562,32 @@ border-image: url(:/images/button/288_ov.png);
562 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 562 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
563 </property> 563 </property>
564 </widget> 564 </widget>
  565 + <widget class="WaterLevelIcon" name="label_6">
  566 + <property name="geometry">
  567 + <rect>
  568 + <x>670</x>
  569 + <y>290</y>
  570 + <width>111</width>
  571 + <height>121</height>
  572 + </rect>
  573 + </property>
  574 + <property name="text">
  575 + <string/>
  576 + </property>
  577 + </widget>
  578 + <widget class="IgnitionIcon" name="label_5">
  579 + <property name="geometry">
  580 + <rect>
  581 + <x>662</x>
  582 + <y>164</y>
  583 + <width>111</width>
  584 + <height>121</height>
  585 + </rect>
  586 + </property>
  587 + <property name="text">
  588 + <string/>
  589 + </property>
  590 + </widget>
565 </widget> 591 </widget>
566 <widget class="QWidget" name="page_2"/> 592 <widget class="QWidget" name="page_2"/>
567 </widget> 593 </widget>
@@ -1442,6 +1468,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c @@ -1442,6 +1468,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
1442 <header>digitalclock.h</header> 1468 <header>digitalclock.h</header>
1443 </customwidget> 1469 </customwidget>
1444 <customwidget> 1470 <customwidget>
  1471 + <class>IgnitionIcon</class>
  1472 + <extends>QLabel</extends>
  1473 + <header>ignitionicon.h</header>
  1474 + </customwidget>
  1475 + <customwidget>
  1476 + <class>WaterLevelIcon</class>
  1477 + <extends>QLabel</extends>
  1478 + <header>waterlevelicon.h</header>
  1479 + </customwidget>
  1480 + <customwidget>
1445 <class>Slider</class> 1481 <class>Slider</class>
1446 <extends>QWidget</extends> 1482 <extends>QWidget</extends>
1447 <header>slider.h</header> 1483 <header>slider.h</header>
app/gui/oven_control/programmingautoselectionwindow.ui
  Diff comments   View file @5f017a9
@@ -165,6 +165,32 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 @@ -165,6 +165,32 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
165 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 165 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
166 </property> 166 </property>
167 </widget> 167 </widget>
  168 + <widget class="WaterLevelIcon" name="label_6">
  169 + <property name="geometry">
  170 + <rect>
  171 + <x>670</x>
  172 + <y>290</y>
  173 + <width>111</width>
  174 + <height>121</height>
  175 + </rect>
  176 + </property>
  177 + <property name="text">
  178 + <string/>
  179 + </property>
  180 + </widget>
  181 + <widget class="IgnitionIcon" name="label_5">
  182 + <property name="geometry">
  183 + <rect>
  184 + <x>662</x>
  185 + <y>164</y>
  186 + <width>111</width>
  187 + <height>121</height>
  188 + </rect>
  189 + </property>
  190 + <property name="text">
  191 + <string/>
  192 + </property>
  193 + </widget>
168 </widget> 194 </widget>
169 <widget class="QWidget" name="page_2"/> 195 <widget class="QWidget" name="page_2"/>
170 </widget> 196 </widget>
@@ -216,6 +242,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 @@ -216,6 +242,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
216 <extends>QLabel</extends> 242 <extends>QLabel</extends>
217 <header>digitalclock.h</header> 243 <header>digitalclock.h</header>
218 </customwidget> 244 </customwidget>
  245 + <customwidget>
  246 + <class>IgnitionIcon</class>
  247 + <extends>QLabel</extends>
  248 + <header>ignitionicon.h</header>
  249 + </customwidget>
  250 + <customwidget>
  251 + <class>WaterLevelIcon</class>
  252 + <extends>QLabel</extends>
  253 + <header>waterlevelicon.h</header>
  254 + </customwidget>
219 </customwidgets> 255 </customwidgets>
220 <resources/> 256 <resources/>
221 <connections/> 257 <connections/>
app/gui/oven_control/programmingmanualwindow.ui
  Diff comments   View file @5f017a9
@@ -190,6 +190,32 @@ height: 33px; @@ -190,6 +190,32 @@ height: 33px;
190 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 190 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
191 </property> 191 </property>
192 </widget> 192 </widget>
  193 + <widget class="WaterLevelIcon" name="label_7">
  194 + <property name="geometry">
  195 + <rect>
  196 + <x>670</x>
  197 + <y>290</y>
  198 + <width>111</width>
  199 + <height>121</height>
  200 + </rect>
  201 + </property>
  202 + <property name="text">
  203 + <string/>
  204 + </property>
  205 + </widget>
  206 + <widget class="IgnitionIcon" name="label_8">
  207 + <property name="geometry">
  208 + <rect>
  209 + <x>662</x>
  210 + <y>164</y>
  211 + <width>111</width>
  212 + <height>121</height>
  213 + </rect>
  214 + </property>
  215 + <property name="text">
  216 + <string/>
  217 + </property>
  218 + </widget>
193 </widget> 219 </widget>
194 <widget class="QWidget" name="closeDoorWidget"> 220 <widget class="QWidget" name="closeDoorWidget">
195 <property name="styleSheet"> 221 <property name="styleSheet">
@@ -991,14 +1017,19 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } @@ -991,14 +1017,19 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
991 <header>halfenergyicon.h</header> 1017 <header>halfenergyicon.h</header>
992 </customwidget> 1018 </customwidget>
993 <customwidget> 1019 <customwidget>
994 - <class>AnimatedImageBox</class> 1020 + <class>DigitalClock</class>
995 <extends>QLabel</extends> 1021 <extends>QLabel</extends>
996 - <header>animatedimagebox.h</header> 1022 + <header>digitalclock.h</header>
997 </customwidget> 1023 </customwidget>
998 <customwidget> 1024 <customwidget>
999 - <class>DigitalClock</class> 1025 + <class>IgnitionIcon</class>
1000 <extends>QLabel</extends> 1026 <extends>QLabel</extends>
1001 - <header>digitalclock.h</header> 1027 + <header>ignitionicon.h</header>
  1028 + </customwidget>
  1029 + <customwidget>
  1030 + <class>WaterLevelIcon</class>
  1031 + <extends>QLabel</extends>
  1032 + <header>waterlevelicon.h</header>
1002 </customwidget> 1033 </customwidget>
1003 <customwidget> 1034 <customwidget>
1004 <class>Slider</class> 1035 <class>Slider</class>
@@ -1006,6 +1037,11 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } @@ -1006,6 +1037,11 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
1006 <header>slider.h</header> 1037 <header>slider.h</header>
1007 <container>1</container> 1038 <container>1</container>
1008 </customwidget> 1039 </customwidget>
  1040 + <customwidget>
  1041 + <class>AnimatedImageBox</class>
  1042 + <extends>QLabel</extends>
  1043 + <header>animatedimagebox.h</header>
  1044 + </customwidget>
1009 </customwidgets> 1045 </customwidgets>
1010 <tabstops> 1046 <tabstops>
1011 <tabstop>steamButton</tabstop> 1047 <tabstop>steamButton</tabstop>
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @5f017a9
@@ -742,6 +742,32 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); @@ -742,6 +742,32 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png);
742 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 742 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
743 </property> 743 </property>
744 </widget> 744 </widget>
  745 + <widget class="WaterLevelIcon" name="label_6">
  746 + <property name="geometry">
  747 + <rect>
  748 + <x>670</x>
  749 + <y>290</y>
  750 + <width>111</width>
  751 + <height>121</height>
  752 + </rect>
  753 + </property>
  754 + <property name="text">
  755 + <string/>
  756 + </property>
  757 + </widget>
  758 + <widget class="IgnitionIcon" name="label_5">
  759 + <property name="geometry">
  760 + <rect>
  761 + <x>662</x>
  762 + <y>164</y>
  763 + <width>111</width>
  764 + <height>121</height>
  765 + </rect>
  766 + </property>
  767 + <property name="text">
  768 + <string/>
  769 + </property>
  770 + </widget>
745 </widget> 771 </widget>
746 <widget class="QWidget" name="page_2"/> 772 <widget class="QWidget" name="page_2"/>
747 </widget> 773 </widget>
@@ -774,6 +800,16 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); @@ -774,6 +800,16 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png);
774 <extends>QLabel</extends> 800 <extends>QLabel</extends>
775 <header>digitalclock.h</header> 801 <header>digitalclock.h</header>
776 </customwidget> 802 </customwidget>
  803 + <customwidget>
  804 + <class>IgnitionIcon</class>
  805 + <extends>QLabel</extends>
  806 + <header>ignitionicon.h</header>
  807 + </customwidget>
  808 + <customwidget>
  809 + <class>WaterLevelIcon</class>
  810 + <extends>QLabel</extends>
  811 + <header>waterlevelicon.h</header>
  812 + </customwidget>
777 </customwidgets> 813 </customwidgets>
778 <tabstops> 814 <tabstops>
779 <tabstop>steamButton</tabstop> 815 <tabstop>steamButton</tabstop>
app/gui/oven_control/programmingwindow.ui
  Diff comments   View file @5f017a9
@@ -128,6 +128,32 @@ background: none; @@ -128,6 +128,32 @@ background: none;
128 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 128 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
129 </property> 129 </property>
130 </widget> 130 </widget>
  131 + <widget class="WaterLevelIcon" name="label_6">
  132 + <property name="geometry">
  133 + <rect>
  134 + <x>670</x>
  135 + <y>290</y>
  136 + <width>111</width>
  137 + <height>121</height>
  138 + </rect>
  139 + </property>
  140 + <property name="text">
  141 + <string/>
  142 + </property>
  143 + </widget>
  144 + <widget class="IgnitionIcon" name="label_5">
  145 + <property name="geometry">
  146 + <rect>
  147 + <x>662</x>
  148 + <y>164</y>
  149 + <width>111</width>
  150 + <height>121</height>
  151 + </rect>
  152 + </property>
  153 + <property name="text">
  154 + <string/>
  155 + </property>
  156 + </widget>
131 </widget> 157 </widget>
132 <widget class="QWidget" name="page_2"/> 158 <widget class="QWidget" name="page_2"/>
133 </widget> 159 </widget>
@@ -339,6 +365,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_ @@ -339,6 +365,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_
339 <extends>QLabel</extends> 365 <extends>QLabel</extends>
340 <header>digitalclock.h</header> 366 <header>digitalclock.h</header>
341 </customwidget> 367 </customwidget>
  368 + <customwidget>
  369 + <class>IgnitionIcon</class>
  370 + <extends>QLabel</extends>
  371 + <header>ignitionicon.h</header>
  372 + </customwidget>
  373 + <customwidget>
  374 + <class>WaterLevelIcon</class>
  375 + <extends>QLabel</extends>
  376 + <header>waterlevelicon.h</header>
  377 + </customwidget>
342 </customwidgets> 378 </customwidgets>
343 <tabstops> 379 <tabstops>
344 <tabstop>autoButton</tabstop> 380 <tabstop>autoButton</tabstop>
app/gui/oven_control/realtimemain.ui
  Diff comments   View file @5f017a9
@@ -84,6 +84,32 @@ @@ -84,6 +84,32 @@
84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
85 </property> 85 </property>
86 </widget> 86 </widget>
  87 + <widget class="WaterLevelIcon" name="label_6">
  88 + <property name="geometry">
  89 + <rect>
  90 + <x>670</x>
  91 + <y>290</y>
  92 + <width>111</width>
  93 + <height>121</height>
  94 + </rect>
  95 + </property>
  96 + <property name="text">
  97 + <string/>
  98 + </property>
  99 + </widget>
  100 + <widget class="IgnitionIcon" name="label_7">
  101 + <property name="geometry">
  102 + <rect>
  103 + <x>662</x>
  104 + <y>164</y>
  105 + <width>111</width>
  106 + <height>121</height>
  107 + </rect>
  108 + </property>
  109 + <property name="text">
  110 + <string/>
  111 + </property>
  112 + </widget>
87 </widget> 113 </widget>
88 <widget class="QWidget" name="page_2"/> 114 <widget class="QWidget" name="page_2"/>
89 </widget> 115 </widget>
@@ -340,6 +366,16 @@ QPushButton { text-align: center;} @@ -340,6 +366,16 @@ QPushButton { text-align: center;}
340 <extends>QLabel</extends> 366 <extends>QLabel</extends>
341 <header>digitalclock.h</header> 367 <header>digitalclock.h</header>
342 </customwidget> 368 </customwidget>
  369 + <customwidget>
  370 + <class>IgnitionIcon</class>
  371 + <extends>QLabel</extends>
  372 + <header>ignitionicon.h</header>
  373 + </customwidget>
  374 + <customwidget>
  375 + <class>WaterLevelIcon</class>
  376 + <extends>QLabel</extends>
  377 + <header>waterlevelicon.h</header>
  378 + </customwidget>
343 </customwidgets> 379 </customwidgets>
344 <resources> 380 <resources>
345 <include location="resources.qrc"/> 381 <include location="resources.qrc"/>
app/gui/oven_control/realtimepartswindow.ui
  Diff comments   View file @5f017a9
@@ -85,6 +85,32 @@ @@ -85,6 +85,32 @@
85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
86 </property> 86 </property>
87 </widget> 87 </widget>
  88 + <widget class="WaterLevelIcon" name="label_6">
  89 + <property name="geometry">
  90 + <rect>
  91 + <x>670</x>
  92 + <y>290</y>
  93 + <width>111</width>
  94 + <height>121</height>
  95 + </rect>
  96 + </property>
  97 + <property name="text">
  98 + <string/>
  99 + </property>
  100 + </widget>
  101 + <widget class="IgnitionIcon" name="label_5">
  102 + <property name="geometry">
  103 + <rect>
  104 + <x>662</x>
  105 + <y>164</y>
  106 + <width>111</width>
  107 + <height>121</height>
  108 + </rect>
  109 + </property>
  110 + <property name="text">
  111 + <string/>
  112 + </property>
  113 + </widget>
88 </widget> 114 </widget>
89 <widget class="QWidget" name="page_2"/> 115 <widget class="QWidget" name="page_2"/>
90 </widget> 116 </widget>
@@ -1082,6 +1108,16 @@ QPushButton { text-align: center;} @@ -1082,6 +1108,16 @@ QPushButton { text-align: center;}
1082 <extends>QLabel</extends> 1108 <extends>QLabel</extends>
1083 <header>digitalclock.h</header> 1109 <header>digitalclock.h</header>
1084 </customwidget> 1110 </customwidget>
  1111 + <customwidget>
  1112 + <class>IgnitionIcon</class>
  1113 + <extends>QLabel</extends>
  1114 + <header>ignitionicon.h</header>
  1115 + </customwidget>
  1116 + <customwidget>
  1117 + <class>WaterLevelIcon</class>
  1118 + <extends>QLabel</extends>
  1119 + <header>waterlevelicon.h</header>
  1120 + </customwidget>
1085 </customwidgets> 1121 </customwidgets>
1086 <resources/> 1122 <resources/>
1087 <connections/> 1123 <connections/>
app/gui/oven_control/realtimesensorwindow.ui
  Diff comments   View file @5f017a9
@@ -85,6 +85,32 @@ @@ -85,6 +85,32 @@
85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 85 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
86 </property> 86 </property>
87 </widget> 87 </widget>
  88 + <widget class="WaterLevelIcon" name="label_6">
  89 + <property name="geometry">
  90 + <rect>
  91 + <x>670</x>
  92 + <y>290</y>
  93 + <width>111</width>
  94 + <height>121</height>
  95 + </rect>
  96 + </property>
  97 + <property name="text">
  98 + <string/>
  99 + </property>
  100 + </widget>
  101 + <widget class="IgnitionIcon" name="label_5">
  102 + <property name="geometry">
  103 + <rect>
  104 + <x>662</x>
  105 + <y>164</y>
  106 + <width>111</width>
  107 + <height>121</height>
  108 + </rect>
  109 + </property>
  110 + <property name="text">
  111 + <string/>
  112 + </property>
  113 + </widget>
88 </widget> 114 </widget>
89 <widget class="QWidget" name="page_2"/> 115 <widget class="QWidget" name="page_2"/>
90 </widget> 116 </widget>
@@ -1612,6 +1638,16 @@ QPushButton { text-align: center;} @@ -1612,6 +1638,16 @@ QPushButton { text-align: center;}
1612 <extends>QLabel</extends> 1638 <extends>QLabel</extends>
1613 <header>digitalclock.h</header> 1639 <header>digitalclock.h</header>
1614 </customwidget> 1640 </customwidget>
  1641 + <customwidget>
  1642 + <class>IgnitionIcon</class>
  1643 + <extends>QLabel</extends>
  1644 + <header>ignitionicon.h</header>
  1645 + </customwidget>
  1646 + <customwidget>
  1647 + <class>WaterLevelIcon</class>
  1648 + <extends>QLabel</extends>
  1649 + <header>waterlevelicon.h</header>
  1650 + </customwidget>
1615 </customwidgets> 1651 </customwidgets>
1616 <resources/> 1652 <resources/>
1617 <connections/> 1653 <connections/>
app/gui/oven_control/resources.qrc
  Diff comments   View file @5f017a9
@@ -632,5 +632,9 @@ @@ -632,5 +632,9 @@
632 <file>images/background/popup/509.png</file> 632 <file>images/background/popup/509.png</file>
633 <file>images/symbol/up_date.png</file> 633 <file>images/symbol/up_date.png</file>
634 <file>images/symbol/down_date.png</file> 634 <file>images/symbol/down_date.png</file>
  635 + <file>images/symbol/ignited.png</file>
  636 + <file>images/symbol/water_level_high.png</file>
  637 + <file>images/symbol/water_level_middle.png</file>
  638 + <file>images/symbol/water_level_low.png</file>
635 </qresource> 639 </qresource>
636 </RCC> 640 </RCC>
app/gui/oven_control/servicehistorymain.ui
  Diff comments   View file @5f017a9
@@ -84,6 +84,32 @@ @@ -84,6 +84,32 @@
84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 84 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
85 </property> 85 </property>
86 </widget> 86 </widget>
  87 + <widget class="WaterLevelIcon" name="label_6">
  88 + <property name="geometry">
  89 + <rect>
  90 + <x>670</x>
  91 + <y>290</y>
  92 + <width>111</width>
  93 + <height>121</height>
  94 + </rect>
  95 + </property>
  96 + <property name="text">
  97 + <string/>
  98 + </property>
  99 + </widget>
  100 + <widget class="IgnitionIcon" name="label_7">
  101 + <property name="geometry">
  102 + <rect>
  103 + <x>662</x>
  104 + <y>164</y>
  105 + <width>111</width>
  106 + <height>121</height>
  107 + </rect>
  108 + </property>
  109 + <property name="text">
  110 + <string/>
  111 + </property>
  112 + </widget>
87 </widget> 113 </widget>
88 <widget class="QWidget" name="page_2"/> 114 <widget class="QWidget" name="page_2"/>
89 </widget> 115 </widget>
@@ -412,6 +438,16 @@ QPushButton { text-align: center;} @@ -412,6 +438,16 @@ QPushButton { text-align: center;}
412 <extends>QLabel</extends> 438 <extends>QLabel</extends>
413 <header>digitalclock.h</header> 439 <header>digitalclock.h</header>
414 </customwidget> 440 </customwidget>
  441 + <customwidget>
  442 + <class>IgnitionIcon</class>
  443 + <extends>QLabel</extends>
  444 + <header>ignitionicon.h</header>
  445 + </customwidget>
  446 + <customwidget>
  447 + <class>WaterLevelIcon</class>
  448 + <extends>QLabel</extends>
  449 + <header>waterlevelicon.h</header>
  450 + </customwidget>
415 </customwidgets> 451 </customwidgets>
416 <resources> 452 <resources>
417 <include location="resources.qrc"/> 453 <include location="resources.qrc"/>
app/gui/oven_control/udphandler.h
  Diff comments   View file @5f017a9
@@ -65,6 +65,20 @@ public: @@ -65,6 +65,20 @@ public:
65 65
66 int heater() { return (state.onoff_relay_load2 & 0x0F); } 66 int heater() { return (state.onoff_relay_load2 & 0x0F); }
67 67
  68 + bool burnerState(int num) {
  69 + switch (num)
  70 + {
  71 + case 1:
  72 + return state.burner1_state != 0;
  73 + case 2:
  74 + return state.burner2_state != 0;
  75 + case 3:
  76 + return state.burner3_state != 0;
  77 + default:
  78 + return false;
  79 + }
  80 + }
  81 +
68 signals: 82 signals:
69 void changed(); 83 void changed();
70 void timeout(); 84 void timeout();
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_21">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_22">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -1310,6 +1336,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1310,6 +1336,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1310 <extends>QLabel</extends> 1336 <extends>QLabel</extends>
1311 <header>digitalclock.h</header> 1337 <header>digitalclock.h</header>
1312 </customwidget> 1338 </customwidget>
  1339 + <customwidget>
  1340 + <class>IgnitionIcon</class>
  1341 + <extends>QLabel</extends>
  1342 + <header>ignitionicon.h</header>
  1343 + </customwidget>
  1344 + <customwidget>
  1345 + <class>WaterLevelIcon</class>
  1346 + <extends>QLabel</extends>
  1347 + <header>waterlevelicon.h</header>
  1348 + </customwidget>
1313 </customwidgets> 1349 </customwidgets>
1314 <resources> 1350 <resources>
1315 <include location="resources.qrc"/> 1351 <include location="resources.qrc"/>
app/gui/oven_control/washtestwindow.ui
  Diff comments   View file @5f017a9
@@ -81,6 +81,32 @@ @@ -81,6 +81,32 @@
81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 81 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
82 </property> 82 </property>
83 </widget> 83 </widget>
  84 + <widget class="WaterLevelIcon" name="label_18">
  85 + <property name="geometry">
  86 + <rect>
  87 + <x>670</x>
  88 + <y>290</y>
  89 + <width>111</width>
  90 + <height>121</height>
  91 + </rect>
  92 + </property>
  93 + <property name="text">
  94 + <string/>
  95 + </property>
  96 + </widget>
  97 + <widget class="IgnitionIcon" name="label_19">
  98 + <property name="geometry">
  99 + <rect>
  100 + <x>662</x>
  101 + <y>164</y>
  102 + <width>111</width>
  103 + <height>121</height>
  104 + </rect>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
84 </widget> 110 </widget>
85 <widget class="QWidget" name="page_2"/> 111 <widget class="QWidget" name="page_2"/>
86 </widget> 112 </widget>
@@ -709,6 +735,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -709,6 +735,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
709 <extends>QLabel</extends> 735 <extends>QLabel</extends>
710 <header>digitalclock.h</header> 736 <header>digitalclock.h</header>
711 </customwidget> 737 </customwidget>
  738 + <customwidget>
  739 + <class>IgnitionIcon</class>
  740 + <extends>QLabel</extends>
  741 + <header>ignitionicon.h</header>
  742 + </customwidget>
  743 + <customwidget>
  744 + <class>WaterLevelIcon</class>
  745 + <extends>QLabel</extends>
  746 + <header>waterlevelicon.h</header>
  747 + </customwidget>
712 </customwidgets> 748 </customwidgets>
713 <resources> 749 <resources>
714 <include location="resources.qrc"/> 750 <include location="resources.qrc"/>
app/gui/oven_control/washwindow.ui
  Diff comments   View file @5f017a9
@@ -124,6 +124,32 @@ border: none; @@ -124,6 +124,32 @@ border: none;
124 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> 124 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
125 </property> 125 </property>
126 </widget> 126 </widget>
  127 + <widget class="WaterLevelIcon" name="label_6">
  128 + <property name="geometry">
  129 + <rect>
  130 + <x>670</x>
  131 + <y>290</y>
  132 + <width>111</width>
  133 + <height>121</height>
  134 + </rect>
  135 + </property>
  136 + <property name="text">
  137 + <string/>
  138 + </property>
  139 + </widget>
  140 + <widget class="IgnitionIcon" name="label_7">
  141 + <property name="geometry">
  142 + <rect>
  143 + <x>662</x>
  144 + <y>164</y>
  145 + <width>111</width>
  146 + <height>121</height>
  147 + </rect>
  148 + </property>
  149 + <property name="text">
  150 + <string/>
  151 + </property>
  152 + </widget>
127 </widget> 153 </widget>
128 <widget class="QWidget" name="progressContainer"> 154 <widget class="QWidget" name="progressContainer">
129 <property name="styleSheet"> 155 <property name="styleSheet">
@@ -1203,12 +1229,6 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt; @@ -1203,12 +1229,6 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1203 </widget> 1229 </widget>
1204 <customwidgets> 1230 <customwidgets>
1205 <customwidget> 1231 <customwidget>
1206 - <class>WashStepGauge</class>  
1207 - <extends>QWidget</extends>  
1208 - <header>washstepgauge.h</header>  
1209 - <container>1</container>  
1210 - </customwidget>  
1211 - <customwidget>  
1212 <class>Clock</class> 1232 <class>Clock</class>
1213 <extends>QWidget</extends> 1233 <extends>QWidget</extends>
1214 <header>clock.h</header> 1234 <header>clock.h</header>
@@ -1230,14 +1250,30 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt; @@ -1230,14 +1250,30 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1230 <header>halfenergyicon.h</header> 1250 <header>halfenergyicon.h</header>
1231 </customwidget> 1251 </customwidget>
1232 <customwidget> 1252 <customwidget>
  1253 + <class>DigitalClock</class>
  1254 + <extends>QLabel</extends>
  1255 + <header>digitalclock.h</header>
  1256 + </customwidget>
  1257 + <customwidget>
  1258 + <class>IgnitionIcon</class>
  1259 + <extends>QLabel</extends>
  1260 + <header>ignitionicon.h</header>
  1261 + </customwidget>
  1262 + <customwidget>
  1263 + <class>WaterLevelIcon</class>
  1264 + <extends>QLabel</extends>
  1265 + <header>waterlevelicon.h</header>
  1266 + </customwidget>
  1267 + <customwidget>
1233 <class>AnimatedImageBox</class> 1268 <class>AnimatedImageBox</class>
1234 <extends>QLabel</extends> 1269 <extends>QLabel</extends>
1235 <header>animatedimagebox.h</header> 1270 <header>animatedimagebox.h</header>
1236 </customwidget> 1271 </customwidget>
1237 <customwidget> 1272 <customwidget>
1238 - <class>DigitalClock</class>  
1239 - <extends>QLabel</extends>  
1240 - <header>digitalclock.h</header> 1273 + <class>WashStepGauge</class>
  1274 + <extends>QWidget</extends>
  1275 + <header>washstepgauge.h</header>
  1276 + <container>1</container>
1241 </customwidget> 1277 </customwidget>
1242 </customwidgets> 1278 </customwidgets>
1243 <tabstops> 1279 <tabstops>
app/gui/oven_control/waterlevelicon.cpp
  Diff comments   View file @5f017a9
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
  1 +#include "waterlevelicon.h"
  2 +
  3 +#include "udphandler.h"
  4 +
  5 +WaterLevelIcon::WaterLevelIcon(QWidget *parent) : QLabel(parent)
  6 +{
  7 + connect(&timer, SIGNAL(timeout()), SLOT(check()));
  8 + timer.start(1000);
  9 +
  10 + check();
  11 +}
  12 +
  13 +void WaterLevelIcon::check()
  14 +{
  15 + switch (UdpHandler::getInstance()->waterLevel())
  16 + {
  17 + case 3:
  18 + case 2:
  19 + setPixmap(QPixmap(":/images/symbol/water_level_high.png"));
  20 + break;
  21 + case 1:
  22 + setPixmap(QPixmap(":/images/symbol/water_level_middle.png"));
  23 + break;
  24 + case 0:
  25 + setPixmap(QPixmap(":/images/symbol/water_level_low.png"));
  26 + break;
  27 + }
  28 +}
app/gui/oven_control/waterlevelicon.h
  Diff comments   View file @5f017a9
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +#ifndef WATERLEVELICON_H
  2 +#define WATERLEVELICON_H
  3 +
  4 +#include <QLabel>
  5 +#include <QTimer>
  6 +
  7 +class WaterLevelIcon : public QLabel
  8 +{
  9 + Q_OBJECT
  10 +
  11 + QTimer timer;
  12 +
  13 +public:
  14 + explicit WaterLevelIcon(QWidget *parent = Q_NULLPTR);
  15 +
  16 +private slots:
  17 + void check();
  18 +};
  19 +
  20 +#endif // WATERLEVELICON_H