에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 3f5f5d4ce3f9e3e00b1634681736e6c709941f7f

Authored by 고영탁
1 parent 5a38a241e4
Exists in master and in 2 other branches fhd, fhd-demo

디버깅 요청 사항 적용 

- 실시간 데이터 자동 갱신
- 수위센서값 표시
Showing 18 changed files with 532 additions and 17 deletions   Show diff stats
app/gui/oven_control/basicsettingwindow.cpp
  Diff comments   View file @3f5f5d4
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +#include "basicsettingwindow.h"
  2 +#include "ui_basicsettingwindow.h"
  3 +
  4 +BasicSettingWindow::BasicSettingWindow(QWidget *parent) :
  5 + QMainWindow(parent),
  6 + ui(new Ui::BasicSettingWindow)
  7 +{
  8 + ui->setupUi(this);
  9 +}
  10 +
  11 +BasicSettingWindow::~BasicSettingWindow()
  12 +{
  13 + delete ui;
  14 +}
app/gui/oven_control/basicsettingwindow.h
  Diff comments   View file @3f5f5d4
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
  1 +#ifndef BASICSETTINGWINDOW_H
  2 +#define BASICSETTINGWINDOW_H
  3 +
  4 +#include <QMainWindow>
  5 +
  6 +namespace Ui {
  7 +class BasicSettingWindow;
  8 +}
  9 +
  10 +class BasicSettingWindow : public QMainWindow
  11 +{
  12 + Q_OBJECT
  13 +
  14 +public:
  15 + explicit BasicSettingWindow(QWidget *parent = 0);
  16 + ~BasicSettingWindow();
  17 +
  18 +private:
  19 + Ui::BasicSettingWindow *ui;
  20 +};
  21 +
  22 +#endif // BASICSETTINGWINDOW_H
app/gui/oven_control/basicsettingwindow.ui
  Diff comments   View file @3f5f5d4
@@ -0,0 +1,410 @@ @@ -0,0 +1,410 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<ui version="4.0">
  3 + <class>BasicSettingWindow</class>
  4 + <widget class="QMainWindow" name="BasicSettingWindow">
  5 + <property name="geometry">
  6 + <rect>
  7 + <x>0</x>
  8 + <y>0</y>
  9 + <width>900</width>
  10 + <height>1600</height>
  11 + </rect>
  12 + </property>
  13 + <property name="windowTitle">
  14 + <string>MainWindow</string>
  15 + </property>
  16 + <property name="styleSheet">
  17 + <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
  18 +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
  19 +#midWidget { background-image: url(:/images/config/service/basic_setting_bgnd.png); }</string>
  20 + </property>
  21 + <widget class="QWidget" name="centralwidget">
  22 + <property name="styleSheet">
  23 + <string notr="true"/>
  24 + </property>
  25 + <widget class="QStackedWidget" name="upperStack">
  26 + <property name="geometry">
  27 + <rect>
  28 + <x>0</x>
  29 + <y>0</y>
  30 + <width>900</width>
  31 + <height>426</height>
  32 + </rect>
  33 + </property>
  34 + <widget class="QWidget" name="clockContainer">
  35 + <property name="styleSheet">
  36 + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string>
  37 + </property>
  38 + <widget class="Clock" name="clock" native="true">
  39 + <property name="geometry">
  40 + <rect>
  41 + <x>272</x>
  42 + <y>36</y>
  43 + <width>356</width>
  44 + <height>355</height>
  45 + </rect>
  46 + </property>
  47 + </widget>
  48 + </widget>
  49 + <widget class="QWidget" name="page_2"/>
  50 + </widget>
  51 + <widget class="QLabel" name="label_15">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>55</x>
  55 + <y>426</y>
  56 + <width>900</width>
  57 + <height>84</height>
  58 + </rect>
  59 + </property>
  60 + <property name="font">
  61 + <font>
  62 + <family>Malgun Gothic</family>
  63 + <pointsize>11</pointsize>
  64 + </font>
  65 + </property>
  66 + <property name="styleSheet">
  67 + <string notr="true">color: rgb(255, 255, 255);</string>
  68 + </property>
  69 + <property name="text">
  70 + <string>서비스단계(엔지니어모드) &gt; 기본설정</string>
  71 + </property>
  72 + </widget>
  73 + <widget class="QWidget" name="bottomBar" native="true">
  74 + <property name="geometry">
  75 + <rect>
  76 + <x>0</x>
  77 + <y>1450</y>
  78 + <width>900</width>
  79 + <height>150</height>
  80 + </rect>
  81 + </property>
  82 + <widget class="QPushButton" name="backButton">
  83 + <property name="geometry">
  84 + <rect>
  85 + <x>401</x>
  86 + <y>26</y>
  87 + <width>97</width>
  88 + <height>97</height>
  89 + </rect>
  90 + </property>
  91 + <property name="sizePolicy">
  92 + <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
  93 + <horstretch>0</horstretch>
  94 + <verstretch>0</verstretch>
  95 + </sizepolicy>
  96 + </property>
  97 + <property name="styleSheet">
  98 + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); }
  99 +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
  100 + </property>
  101 + <property name="text">
  102 + <string/>
  103 + </property>
  104 + </widget>
  105 + </widget>
  106 + <widget class="QWidget" name="gridLayoutWidget">
  107 + <property name="geometry">
  108 + <rect>
  109 + <x>40</x>
  110 + <y>545</y>
  111 + <width>821</width>
  112 + <height>66</height>
  113 + </rect>
  114 + </property>
  115 + <layout class="QGridLayout" name="gridLayout" columnstretch="67,33">
  116 + <property name="spacing">
  117 + <number>0</number>
  118 + </property>
  119 + <item row="0" column="0" colspan="2">
  120 + <widget class="QPushButton" name="button">
  121 + <property name="enabled">
  122 + <bool>false</bool>
  123 + </property>
  124 + <property name="sizePolicy">
  125 + <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
  126 + <horstretch>0</horstretch>
  127 + <verstretch>0</verstretch>
  128 + </sizepolicy>
  129 + </property>
  130 + <property name="font">
  131 + <font>
  132 + <family>Roboto</family>
  133 + <pointsize>10</pointsize>
  134 + <weight>75</weight>
  135 + <bold>true</bold>
  136 + <underline>false</underline>
  137 + </font>
  138 + </property>
  139 + <property name="styleSheet">
  140 + <string notr="true">QPushButton { border-image: url(:/images/config/pannel.png);color: rgb(255, 255, 255); }
  141 +QPushButton:pressed { border-image: url(:/images/config/pannel_ov.png); }
  142 +QPushButton { text-align: left;}
  143 +</string>
  144 + </property>
  145 + <property name="text">
  146 + <string> 기본설정</string>
  147 + </property>
  148 + </widget>
  149 + </item>
  150 + <item row="0" column="1">
  151 + <widget class="QLabel" name="label_17">
  152 + <property name="enabled">
  153 + <bool>true</bool>
  154 + </property>
  155 + <property name="font">
  156 + <font>
  157 + <family>Malgun Gothic</family>
  158 + <pointsize>11</pointsize>
  159 + <weight>75</weight>
  160 + <bold>true</bold>
  161 + </font>
  162 + </property>
  163 + <property name="styleSheet">
  164 + <string notr="true">color: rgb(255, 255, 255);</string>
  165 + </property>
  166 + <property name="text">
  167 + <string>EM-2</string>
  168 + </property>
  169 + <property name="alignment">
  170 + <set>Qt::AlignCenter</set>
  171 + </property>
  172 + <property name="margin">
  173 + <number>0</number>
  174 + </property>
  175 + </widget>
  176 + </item>
  177 + </layout>
  178 + </widget>
  179 + <widget class="QWidget" name="midWidget" native="true">
  180 + <property name="geometry">
  181 + <rect>
  182 + <x>43</x>
  183 + <y>627</y>
  184 + <width>813</width>
  185 + <height>647</height>
  186 + </rect>
  187 + </property>
  188 + <property name="styleSheet">
  189 + <string notr="true">QLabel{
  190 + color : white;
  191 +}</string>
  192 + </property>
  193 + <widget class="QLabel" name="ctrlLbList_1_1">
  194 + <property name="geometry">
  195 + <rect>
  196 + <x>0</x>
  197 + <y>70</y>
  198 + <width>460</width>
  199 + <height>94</height>
  200 + </rect>
  201 + </property>
  202 + <property name="font">
  203 + <font>
  204 + <family>나눔고딕</family>
  205 + <pointsize>10</pointsize>
  206 + </font>
  207 + </property>
  208 + <property name="text">
  209 + <string>스팀발생기 수동 스케일 제거 후 물의 양</string>
  210 + </property>
  211 + <property name="margin">
  212 + <number>7</number>
  213 + </property>
  214 + </widget>
  215 + <widget class="QLabel" name="ctrlLbList_1_2">
  216 + <property name="geometry">
  217 + <rect>
  218 + <x>0</x>
  219 + <y>166</y>
  220 + <width>460</width>
  221 + <height>94</height>
  222 + </rect>
  223 + </property>
  224 + <property name="font">
  225 + <font>
  226 + <family>나눔고딕</family>
  227 + <pointsize>10</pointsize>
  228 + </font>
  229 + </property>
  230 + <property name="text">
  231 + <string>소형펌프모터 모드</string>
  232 + </property>
  233 + <property name="margin">
  234 + <number>7</number>
  235 + </property>
  236 + </widget>
  237 + <widget class="QLabel" name="ctrlLbList_1_3">
  238 + <property name="geometry">
  239 + <rect>
  240 + <x>0</x>
  241 + <y>263</y>
  242 + <width>460</width>
  243 + <height>94</height>
  244 + </rect>
  245 + </property>
  246 + <property name="font">
  247 + <font>
  248 + <family>나눔고딕</family>
  249 + <pointsize>10</pointsize>
  250 + </font>
  251 + </property>
  252 + <property name="text">
  253 + <string>소형펌프모터 인터벌시간 설정</string>
  254 + </property>
  255 + <property name="margin">
  256 + <number>7</number>
  257 + </property>
  258 + </widget>
  259 + <widget class="QLabel" name="ctrlLbList_1_4">
  260 + <property name="geometry">
  261 + <rect>
  262 + <x>0</x>
  263 + <y>360</y>
  264 + <width>460</width>
  265 + <height>94</height>
  266 + </rect>
  267 + </property>
  268 + <property name="font">
  269 + <font>
  270 + <family>나눔고딕</family>
  271 + <pointsize>10</pointsize>
  272 + </font>
  273 + </property>
  274 + <property name="text">
  275 + <string>건열퀀칭 작동 온도 </string>
  276 + </property>
  277 + <property name="margin">
  278 + <number>7</number>
  279 + </property>
  280 + </widget>
  281 + <widget class="QLabel" name="ctrlLbList_1_5">
  282 + <property name="geometry">
  283 + <rect>
  284 + <x>0</x>
  285 + <y>458</y>
  286 + <width>460</width>
  287 + <height>94</height>
  288 + </rect>
  289 + </property>
  290 + <property name="font">
  291 + <font>
  292 + <family>나눔고딕</family>
  293 + <pointsize>10</pointsize>
  294 + </font>
  295 + </property>
  296 + <property name="text">
  297 + <string>스팀퀀칭 작동온도 </string>
  298 + </property>
  299 + <property name="margin">
  300 + <number>7</number>
  301 + </property>
  302 + </widget>
  303 + <widget class="QLabel" name="ctrlLbList_1_6">
  304 + <property name="geometry">
  305 + <rect>
  306 + <x>0</x>
  307 + <y>553</y>
  308 + <width>460</width>
  309 + <height>94</height>
  310 + </rect>
  311 + </property>
  312 + <property name="font">
  313 + <font>
  314 + <family>나눔고딕</family>
  315 + <pointsize>10</pointsize>
  316 + </font>
  317 + </property>
  318 + <property name="text">
  319 + <string>드레인볼밸브 </string>
  320 + </property>
  321 + <property name="margin">
  322 + <number>7</number>
  323 + </property>
  324 + </widget>
  325 + <widget class="QLabel" name="ctrlLbCol_1">
  326 + <property name="geometry">
  327 + <rect>
  328 + <x>0</x>
  329 + <y>0</y>
  330 + <width>460</width>
  331 + <height>69</height>
  332 + </rect>
  333 + </property>
  334 + <property name="font">
  335 + <font>
  336 + <family>나눔고딕</family>
  337 + <pointsize>10</pointsize>
  338 + </font>
  339 + </property>
  340 + <property name="text">
  341 + <string>설정구분</string>
  342 + </property>
  343 + <property name="margin">
  344 + <number>7</number>
  345 + </property>
  346 + </widget>
  347 + <widget class="QLabel" name="ctrlLbCol_2">
  348 + <property name="geometry">
  349 + <rect>
  350 + <x>460</x>
  351 + <y>0</y>
  352 + <width>201</width>
  353 + <height>69</height>
  354 + </rect>
  355 + </property>
  356 + <property name="font">
  357 + <font>
  358 + <family>나눔고딕</family>
  359 + <pointsize>10</pointsize>
  360 + </font>
  361 + </property>
  362 + <property name="text">
  363 + <string>설 정</string>
  364 + </property>
  365 + <property name="alignment">
  366 + <set>Qt::AlignCenter</set>
  367 + </property>
  368 + <property name="margin">
  369 + <number>7</number>
  370 + </property>
  371 + </widget>
  372 + <widget class="QLabel" name="ctrlLbCol_3">
  373 + <property name="geometry">
  374 + <rect>
  375 + <x>660</x>
  376 + <y>0</y>
  377 + <width>151</width>
  378 + <height>69</height>
  379 + </rect>
  380 + </property>
  381 + <property name="font">
  382 + <font>
  383 + <family>나눔고딕</family>
  384 + <pointsize>10</pointsize>
  385 + </font>
  386 + </property>
  387 + <property name="text">
  388 + <string>상태</string>
  389 + </property>
  390 + <property name="alignment">
  391 + <set>Qt::AlignCenter</set>
  392 + </property>
  393 + <property name="margin">
  394 + <number>7</number>
  395 + </property>
  396 + </widget>
  397 + </widget>
  398 + </widget>
  399 + </widget>
  400 + <customwidgets>
  401 + <customwidget>
  402 + <class>Clock</class>
  403 + <extends>QWidget</extends>
  404 + <header>clock.h</header>
  405 + <container>1</container>
  406 + </customwidget>
  407 + </customwidgets>
  408 + <resources/>
  409 + <connections/>
  410 +</ui>
app/gui/oven_control/configwindow.cpp
  Diff comments   View file @3f5f5d4
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 #include "ui_configwindow.h" 2 #include "ui_configwindow.h"
3 3
4 #include "functiontestwindow.h" 4 #include "functiontestwindow.h"
  5 +#include "engineermenuwindow.h"
5 6
6 ConfigWindow::ConfigWindow(QWidget *parent) : 7 ConfigWindow::ConfigWindow(QWidget *parent) :
7 QMainWindow(parent), 8 QMainWindow(parent),
@@ -29,3 +30,10 @@ void ConfigWindow::on_backButton_clicked() @@ -29,3 +30,10 @@ void ConfigWindow::on_backButton_clicked()
29 { 30 {
30 close(); 31 close();
31 } 32 }
  33 +
  34 +void ConfigWindow::on_pushButton_3_clicked()
  35 +{
  36 + EngineerMenuWindow *w = new EngineerMenuWindow(this);
  37 + w->setWindowModality(Qt::WindowModal);
  38 + w->showFullScreen();
  39 +}
app/gui/oven_control/configwindow.h
  Diff comments   View file @3f5f5d4
@@ -22,6 +22,8 @@ private slots: @@ -22,6 +22,8 @@ private slots:
22 22
23 void on_backButton_clicked(); 23 void on_backButton_clicked();
24 24
  25 + void on_pushButton_3_clicked();
  26 +
25 private: 27 private:
26 Ui::ConfigWindow *ui; 28 Ui::ConfigWindow *ui;
27 }; 29 };
app/gui/oven_control/engineermenuwindow.cpp
  Diff comments   View file @3f5f5d4
@@ -60,4 +60,10 @@ void EngineerMenuWindow::on_engAdjustButton_clicked() @@ -60,4 +60,10 @@ void EngineerMenuWindow::on_engAdjustButton_clicked()
60 w->setWindowModality(Qt::WindowModal); 60 w->setWindowModality(Qt::WindowModal);
61 w->showFullScreen(); 61 w->showFullScreen();
62 w->raise(); 62 w->raise();
  63 +
  64 +}
  65 +
  66 +void EngineerMenuWindow::on_stdConfigButton_clicked()
  67 +{
  68 +
63 } 69 }
app/gui/oven_control/engineermenuwindow.h
  Diff comments   View file @3f5f5d4
@@ -26,6 +26,8 @@ private slots: @@ -26,6 +26,8 @@ private slots:
26 26
27 void on_engAdjustButton_clicked(); 27 void on_engAdjustButton_clicked();
28 28
  29 + void on_stdConfigButton_clicked();
  30 +
29 private: 31 private:
30 Ui::EngineerMenuWindow *ui; 32 Ui::EngineerMenuWindow *ui;
31 }; 33 };
app/gui/oven_control/images/config/service/basic_setting_bgnd.png
  Diff comments   View file @3f5f5d4

3.06 KB
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @3f5f5d4
@@ -124,7 +124,7 @@ height: 33px; @@ -124,7 +124,7 @@ height: 33px;
124 </rect> 124 </rect>
125 </property> 125 </property>
126 <property name="pixmap"> 126 <property name="pixmap">
127 - <pixmap resource="resources.qrc">:/images/animation/close_door_arrow.png</pixmap> 127 + <pixmap>:/images/animation/close_door_arrow.png</pixmap>
128 </property> 128 </property>
129 </widget> 129 </widget>
130 </widget> 130 </widget>
@@ -1416,7 +1416,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } @@ -1416,7 +1416,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
1416 <string/> 1416 <string/>
1417 </property> 1417 </property>
1418 <property name="pixmap"> 1418 <property name="pixmap">
1419 - <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> 1419 + <pixmap>:/images/line/manual_core_temp_horizontal.png</pixmap>
1420 </property> 1420 </property>
1421 </widget> 1421 </widget>
1422 <widget class="QLabel" name="label_2"> 1422 <widget class="QLabel" name="label_2">
@@ -1432,7 +1432,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } @@ -1432,7 +1432,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
1432 <string/> 1432 <string/>
1433 </property> 1433 </property>
1434 <property name="pixmap"> 1434 <property name="pixmap">
1435 - <pixmap resource="resources.qrc">:/images/line/manual_core_temp_vertical.png</pixmap> 1435 + <pixmap>:/images/line/manual_core_temp_vertical.png</pixmap>
1436 </property> 1436 </property>
1437 </widget> 1437 </widget>
1438 <widget class="QLabel" name="label_3"> 1438 <widget class="QLabel" name="label_3">
@@ -1448,7 +1448,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } @@ -1448,7 +1448,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
1448 <string/> 1448 <string/>
1449 </property> 1449 </property>
1450 <property name="pixmap"> 1450 <property name="pixmap">
1451 - <pixmap resource="resources.qrc">:/images/line/manual_core_temp_vertical.png</pixmap> 1451 + <pixmap>:/images/line/manual_core_temp_vertical.png</pixmap>
1452 </property> 1452 </property>
1453 </widget> 1453 </widget>
1454 <widget class="QLabel" name="label_4"> 1454 <widget class="QLabel" name="label_4">
@@ -1464,7 +1464,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } @@ -1464,7 +1464,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
1464 <string/> 1464 <string/>
1465 </property> 1465 </property>
1466 <property name="pixmap"> 1466 <property name="pixmap">
1467 - <pixmap resource="resources.qrc">:/images/line/manual_core_temp_vertical.png</pixmap> 1467 + <pixmap>:/images/line/manual_core_temp_vertical.png</pixmap>
1468 </property> 1468 </property>
1469 </widget> 1469 </widget>
1470 <widget class="QLabel" name="innerInterTempLabel"> 1470 <widget class="QLabel" name="innerInterTempLabel">
@@ -2335,8 +2335,6 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } @@ -2335,8 +2335,6 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
2335 <header>animatedimagebox.h</header> 2335 <header>animatedimagebox.h</header>
2336 </customwidget> 2336 </customwidget>
2337 </customwidgets> 2337 </customwidgets>
2338 - <resources>  
2339 - <include location="resources.qrc"/>  
2340 - </resources> 2338 + <resources/>
2341 <connections/> 2339 <connections/>
2342 </ui> 2340 </ui>
app/gui/oven_control/operationtimeheat.ui
  Diff comments   View file @3f5f5d4
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 <string notr="true">color: rgb(255, 255, 255);</string> 67 <string notr="true">color: rgb(255, 255, 255);</string>
68 </property> 68 </property>
69 <property name="text"> 69 <property name="text">
70 - <string>서비스단계(엔지니어모드) &gt; 작동시간 &gt; 가열</string> 70 + <string>서비스단계(엔지니어모드) &gt; 작동시간 &gt; 가열부</string>
71 </property> 71 </property>
72 </widget> 72 </widget>
73 <widget class="QWidget" name="bottomBar" native="true"> 73 <widget class="QWidget" name="bottomBar" native="true">
app/gui/oven_control/oven_control.pro
  Diff comments   View file @3f5f5d4
@@ -64,7 +64,8 @@ SOURCES += main.cpp\ @@ -64,7 +64,8 @@ SOURCES += main.cpp\
64 adjustmentwindow.cpp \ 64 adjustmentwindow.cpp \
65 yesnopopupdlg.cpp \ 65 yesnopopupdlg.cpp \
66 configpanelbutton.cpp \ 66 configpanelbutton.cpp \
67 - config.cpp 67 + config.cpp \
  68 + basicsettingwindow.cpp
68 69
69 HEADERS += mainwindow.h \ 70 HEADERS += mainwindow.h \
70 cook.h \ 71 cook.h \
@@ -118,7 +119,8 @@ HEADERS += mainwindow.h \ @@ -118,7 +119,8 @@ HEADERS += mainwindow.h \
118 adjustmentwindow.h \ 119 adjustmentwindow.h \
119 yesnopopupdlg.h \ 120 yesnopopupdlg.h \
120 configpanelbutton.h \ 121 configpanelbutton.h \
121 - config.h 122 + config.h \
  123 + basicsettingwindow.h
122 124
123 FORMS += mainwindow.ui \ 125 FORMS += mainwindow.ui \
124 manualcookwindow.ui \ 126 manualcookwindow.ui \
@@ -150,7 +152,8 @@ FORMS += mainwindow.ui \ @@ -150,7 +152,8 @@ FORMS += mainwindow.ui \
150 realtimesensorwindow.ui \ 152 realtimesensorwindow.ui \
151 adjustmentwindow.ui \ 153 adjustmentwindow.ui \
152 yesnopopupdlg.ui \ 154 yesnopopupdlg.ui \
153 - configpanelbutton.ui 155 + configpanelbutton.ui \
  156 + basicsettingwindow.ui
154 157
155 RESOURCES += \ 158 RESOURCES += \
156 resources.qrc 159 resources.qrc
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @3f5f5d4
@@ -377,8 +377,10 @@ void OvenStatistics::oneSecTimerFired(void){ @@ -377,8 +377,10 @@ void OvenStatistics::oneSecTimerFired(void){
377 //부품 377 //부품
378 if(state.door_state !=0){ 378 if(state.door_state !=0){
379 srvdata->use_log.items.door_open+=1; 379 srvdata->use_log.items.door_open+=1;
380 - realdata.b.door_open = 1; 380 +
381 } 381 }
  382 +
  383 +
382 if(state.onoff_state2 !=0){ 384 if(state.onoff_state2 !=0){
383 if( (state.onoff_state2 & LOAD_STATE2_DV)!=0){ 385 if( (state.onoff_state2 & LOAD_STATE2_DV)!=0){
384 srvdata->use_log.items.dv_open+=1; 386 srvdata->use_log.items.dv_open+=1;
@@ -415,7 +417,15 @@ void OvenStatistics::oneSecTimerFired(void){ @@ -415,7 +417,15 @@ void OvenStatistics::oneSecTimerFired(void){
415 realdata.b.snv_open = (state.onoff_state2&LOAD_STATE2_SNV)==0?0:1; 417 realdata.b.snv_open = (state.onoff_state2&LOAD_STATE2_SNV)==0?0:1;
416 realdata.b.wsv_open = (state.onoff_state2&LOAD_STATE2_WSV)==0?0:1; 418 realdata.b.wsv_open = (state.onoff_state2&LOAD_STATE2_WSV)==0?0:1;
417 realdata.b.ssv_open = (state.onoff_state2&LOAD_STATE2_SSV)==0?0:1; 419 realdata.b.ssv_open = (state.onoff_state2&LOAD_STATE2_SSV)==0?0:1;
418 - realdata.b.water_level = 0; 420 + if( (state.reserved11 & 0x0018) !=0){
  421 + if( (state.reserved11&0x0008) != 0){
  422 + realdata.b.water_level = water_level_high;
  423 + }
  424 + else if( (state.reserved11 & 0x0010) !=0){
  425 + realdata.b.water_level = water_level_low;
  426 + }
  427 + }
  428 + else realdata.b.water_level = water_level_normal;
419 429
420 if(srvdata->sensor_log.items.B1.high_temp.itemp < state.sensor1 ){ 430 if(srvdata->sensor_log.items.B1.high_temp.itemp < state.sensor1 ){
421 srvdata->sensor_log.items.B1.high_temp.itemp = state.sensor1; 431 srvdata->sensor_log.items.B1.high_temp.itemp = state.sensor1;
app/gui/oven_control/ovenstatics.h
  Diff comments   View file @3f5f5d4
@@ -143,6 +143,12 @@ enum wash_mode_type{ @@ -143,6 +143,12 @@ enum wash_mode_type{
143 wash_mode_highspeed 143 wash_mode_highspeed
144 }; 144 };
145 145
  146 +enum water_level_state{
  147 + water_level_normal = 0,
  148 + water_level_low,
  149 + water_level_high
  150 +};
  151 +
146 152
147 typedef union 153 typedef union
148 { 154 {
app/gui/oven_control/realtimepartswindow.cpp
  Diff comments   View file @3f5f5d4
@@ -47,10 +47,18 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : @@ -47,10 +47,18 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) :
47 47
48 reloadUi(); 48 reloadUi();
49 49
  50 + timer = new QTimer(this);
  51 + connect(timer, SIGNAL(timeout()),this,SLOT(oneSecTimerFired()));
  52 + timer->start(1000); //1000ms fired
  53 +
50 } 54 }
51 55
  56 +
  57 +
52 RealtimePartsWindow::~RealtimePartsWindow() 58 RealtimePartsWindow::~RealtimePartsWindow()
53 { 59 {
  60 + timer->stop();
  61 + delete timer;
54 delete ui; 62 delete ui;
55 } 63 }
56 64
@@ -77,8 +85,15 @@ void RealtimePartsWindow::reloadUi(void){ @@ -77,8 +85,15 @@ void RealtimePartsWindow::reloadUi(void){
77 if(realdata.b.snv_open) ui->m_ctrlLbListState_1_3->setText(tr("ON")); 85 if(realdata.b.snv_open) ui->m_ctrlLbListState_1_3->setText(tr("ON"));
78 else ui->m_ctrlLbListState_1_3->setText(tr("OFF")); 86 else ui->m_ctrlLbListState_1_3->setText(tr("OFF"));
79 87
80 - strTemp.sprintf("%d",realdata.b.water_level);  
81 - ui->m_ctrlLbListState_1_4->setText(strTemp); 88 + //strTemp.sprintf("%d",realdata.b.water_level);
  89 + //ui->m_ctrlLbListState_1_4->setText(strTemp);
  90 + if(realdata.b.water_level == water_level_high){
  91 + ui->m_ctrlLbListState_1_4->setText(tr("HIGH"));
  92 + }
  93 + else if(realdata.b.water_level == water_level_low){
  94 + ui->m_ctrlLbListState_1_4->setText(tr("LOW"));
  95 + }
  96 + else ui->m_ctrlLbListState_1_4->setText(tr("NORMAL"));
82 97
83 if(realdata.b.sgnv_open) ui->m_ctrlLbListState_1_5->setText(tr("ON")); 98 if(realdata.b.sgnv_open) ui->m_ctrlLbListState_1_5->setText(tr("ON"));
84 else ui->m_ctrlLbListState_1_5->setText(tr("OFF")); 99 else ui->m_ctrlLbListState_1_5->setText(tr("OFF"));
@@ -93,6 +108,8 @@ void RealtimePartsWindow::reloadUi(void){ @@ -93,6 +108,8 @@ void RealtimePartsWindow::reloadUi(void){
93 else ui->m_ctrlLbListState_1_8->setText(tr("OFF")); 108 else ui->m_ctrlLbListState_1_8->setText(tr("OFF"));
94 109
95 110
  111 +
  112 +
96 for(i=1;i<CONTROL_LIST_COL_MAX;i++){ 113 for(i=1;i<CONTROL_LIST_COL_MAX;i++){
97 for(j=0;j<CONTROL_LIST_ITEM_MAX;j++){ 114 for(j=0;j<CONTROL_LIST_ITEM_MAX;j++){
98 m_arrLbState[i][j]->setText("-"); 115 m_arrLbState[i][j]->setText("-");
@@ -100,3 +117,7 @@ void RealtimePartsWindow::reloadUi(void){ @@ -100,3 +117,7 @@ void RealtimePartsWindow::reloadUi(void){
100 } 117 }
101 118
102 } 119 }
  120 +
  121 +void RealtimePartsWindow::oneSecTimerFired(void){
  122 + reloadUi();
  123 +}
app/gui/oven_control/realtimepartswindow.h
  Diff comments   View file @3f5f5d4
@@ -22,10 +22,12 @@ public: @@ -22,10 +22,12 @@ public:
22 22
23 private slots: 23 private slots:
24 void on_backButton_clicked(); 24 void on_backButton_clicked();
  25 + void oneSecTimerFired(void);
25 26
26 private: 27 private:
27 Ui::RealtimePartsWindow *ui; 28 Ui::RealtimePartsWindow *ui;
28 QLabel *m_arrLbState[CONTROL_LIST_COL_MAX][CONTROL_LIST_ITEM_MAX]; 29 QLabel *m_arrLbState[CONTROL_LIST_COL_MAX][CONTROL_LIST_ITEM_MAX];
  30 + QTimer *timer;
29 31
30 void reloadUi(void); 32 void reloadUi(void);
31 }; 33 };
app/gui/oven_control/realtimesensorwindow.cpp
  Diff comments   View file @3f5f5d4
@@ -58,10 +58,15 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : @@ -58,10 +58,15 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) :
58 m_arrSensorItems[i] = &(ovs->srvdata->sensor_log.values[m_arrSensorItemIdxs[i]]); 58 m_arrSensorItems[i] = &(ovs->srvdata->sensor_log.values[m_arrSensorItemIdxs[i]]);
59 } 59 }
60 reloadUi(); 60 reloadUi();
  61 + timer = new QTimer(this);
  62 + connect(timer, SIGNAL(timeout()),this,SLOT(oneSecTimerFired()));
  63 + timer->start(1000); //1000ms fired
61 } 64 }
62 65
63 RealtimeSensorWindow::~RealtimeSensorWindow() 66 RealtimeSensorWindow::~RealtimeSensorWindow()
64 { 67 {
  68 + timer->stop();
  69 + delete timer;
65 delete ui; 70 delete ui;
66 } 71 }
67 72
@@ -125,3 +130,7 @@ void RealtimeSensorWindow::reloadUi(void){ @@ -125,3 +130,7 @@ void RealtimeSensorWindow::reloadUi(void){
125 } 130 }
126 131
127 } 132 }
  133 +
  134 +void RealtimeSensorWindow::oneSecTimerFired(void){
  135 + reloadUi();
  136 +}
app/gui/oven_control/realtimesensorwindow.h
  Diff comments   View file @3f5f5d4
@@ -22,6 +22,7 @@ public: @@ -22,6 +22,7 @@ public:
22 22
23 private slots: 23 private slots:
24 void on_backButton_clicked(); 24 void on_backButton_clicked();
  25 + void oneSecTimerFired(void);
25 26
26 private: 27 private:
27 const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={ 28 const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={
@@ -34,7 +35,7 @@ private: @@ -34,7 +35,7 @@ private:
34 Ui::RealtimeSensorWindow *ui; 35 Ui::RealtimeSensorWindow *ui;
35 QLabel *m_arrLbState[REALSENSOR_CONTROL_LIST_COL_MAX][REALSENSOR_CONTROL_LIST_ITEM_MAX]; 36 QLabel *m_arrLbState[REALSENSOR_CONTROL_LIST_COL_MAX][REALSENSOR_CONTROL_LIST_ITEM_MAX];
36 sensor_log_item* m_arrSensorItems[REALSENSOR_CONTROL_LIST_ITEM_MAX]; 37 sensor_log_item* m_arrSensorItems[REALSENSOR_CONTROL_LIST_ITEM_MAX];
37 - 38 + QTimer *timer;
38 39
39 void reloadUi(void); 40 void reloadUi(void);
40 }; 41 };
app/gui/oven_control/resources.qrc
  Diff comments   View file @3f5f5d4
@@ -432,5 +432,6 @@ @@ -432,5 +432,6 @@
432 <file>images/config/service/realtime_parts_bgnd.png</file> 432 <file>images/config/service/realtime_parts_bgnd.png</file>
433 <file>images/config/service/realtime_sensor_bgnd.png</file> 433 <file>images/config/service/realtime_sensor_bgnd.png</file>
434 <file>images/config/service/adjustment_line.png</file> 434 <file>images/config/service/adjustment_line.png</file>
  435 + <file>images/config/service/basic_setting_bgnd.png</file>
435 </qresource> 436 </qresource>
436 </RCC> 437 </RCC>