diff --git a/app/gui/oven_control/basicsettingwindow.cpp b/app/gui/oven_control/basicsettingwindow.cpp new file mode 100644 index 0000000..1e16f0f --- /dev/null +++ b/app/gui/oven_control/basicsettingwindow.cpp @@ -0,0 +1,14 @@ +#include "basicsettingwindow.h" +#include "ui_basicsettingwindow.h" + +BasicSettingWindow::BasicSettingWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::BasicSettingWindow) +{ + ui->setupUi(this); +} + +BasicSettingWindow::~BasicSettingWindow() +{ + delete ui; +} diff --git a/app/gui/oven_control/basicsettingwindow.h b/app/gui/oven_control/basicsettingwindow.h new file mode 100644 index 0000000..74a139e --- /dev/null +++ b/app/gui/oven_control/basicsettingwindow.h @@ -0,0 +1,22 @@ +#ifndef BASICSETTINGWINDOW_H +#define BASICSETTINGWINDOW_H + +#include + +namespace Ui { +class BasicSettingWindow; +} + +class BasicSettingWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit BasicSettingWindow(QWidget *parent = 0); + ~BasicSettingWindow(); + +private: + Ui::BasicSettingWindow *ui; +}; + +#endif // BASICSETTINGWINDOW_H diff --git a/app/gui/oven_control/basicsettingwindow.ui b/app/gui/oven_control/basicsettingwindow.ui new file mode 100644 index 0000000..4f54275 --- /dev/null +++ b/app/gui/oven_control/basicsettingwindow.ui @@ -0,0 +1,410 @@ + + + BasicSettingWindow + + + + 0 + 0 + 900 + 1600 + + + + MainWindow + + + #centralwidget { background-image: url(:/images/background/config_service.png); } +#bottomBar { background-image: url(:/images/bottom_bar/background.png); } +#midWidget { background-image: url(:/images/config/service/basic_setting_bgnd.png); } + + + + + + + + + 0 + 0 + 900 + 426 + + + + + #clockContainer { background-image: url(:/images/clock/background.png); } + + + + + 272 + 36 + 356 + 355 + + + + + + + + + + 55 + 426 + 900 + 84 + + + + + Malgun Gothic + 11 + + + + color: rgb(255, 255, 255); + + + 서비스단계(엔지니어모드) > 기본설정 + + + + + + 0 + 1450 + 900 + 150 + + + + + + 401 + 26 + 97 + 97 + + + + + 0 + 0 + + + + QPushButton { border-image: url(:/images/bottom_bar/back.png); } +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); } + + + + + + + + + + 40 + 545 + 821 + 66 + + + + + 0 + + + + + false + + + + 0 + 0 + + + + + Roboto + 10 + 75 + true + false + + + + QPushButton { border-image: url(:/images/config/pannel.png);color: rgb(255, 255, 255); } +QPushButton:pressed { border-image: url(:/images/config/pannel_ov.png); } +QPushButton { text-align: left;} + + + + 기본설정 + + + + + + + true + + + + Malgun Gothic + 11 + 75 + true + + + + color: rgb(255, 255, 255); + + + EM-2 + + + Qt::AlignCenter + + + 0 + + + + + + + + + 43 + 627 + 813 + 647 + + + + QLabel{ + color : white; +} + + + + + 0 + 70 + 460 + 94 + + + + + 나눔고딕 + 10 + + + + 스팀발생기 수동 스케일 제거 후 물의 양 + + + 7 + + + + + + 0 + 166 + 460 + 94 + + + + + 나눔고딕 + 10 + + + + 소형펌프모터 모드 + + + 7 + + + + + + 0 + 263 + 460 + 94 + + + + + 나눔고딕 + 10 + + + + 소형펌프모터 인터벌시간 설정 + + + 7 + + + + + + 0 + 360 + 460 + 94 + + + + + 나눔고딕 + 10 + + + + 건열퀀칭 작동 온도 + + + 7 + + + + + + 0 + 458 + 460 + 94 + + + + + 나눔고딕 + 10 + + + + 스팀퀀칭 작동온도 + + + 7 + + + + + + 0 + 553 + 460 + 94 + + + + + 나눔고딕 + 10 + + + + 드레인볼밸브 + + + 7 + + + + + + 0 + 0 + 460 + 69 + + + + + 나눔고딕 + 10 + + + + 설정구분 + + + 7 + + + + + + 460 + 0 + 201 + 69 + + + + + 나눔고딕 + 10 + + + + 설 정 + + + Qt::AlignCenter + + + 7 + + + + + + 660 + 0 + 151 + 69 + + + + + 나눔고딕 + 10 + + + + 상태 + + + Qt::AlignCenter + + + 7 + + + + + + + + Clock + QWidget +
clock.h
+ 1 + + + + + diff --git a/app/gui/oven_control/configwindow.cpp b/app/gui/oven_control/configwindow.cpp index 90870e0..e98d499 100644 --- a/app/gui/oven_control/configwindow.cpp +++ b/app/gui/oven_control/configwindow.cpp @@ -2,6 +2,7 @@ #include "ui_configwindow.h" #include "functiontestwindow.h" +#include "engineermenuwindow.h" ConfigWindow::ConfigWindow(QWidget *parent) : QMainWindow(parent), @@ -29,3 +30,10 @@ void ConfigWindow::on_backButton_clicked() { close(); } + +void ConfigWindow::on_pushButton_3_clicked() +{ + EngineerMenuWindow *w = new EngineerMenuWindow(this); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); +} diff --git a/app/gui/oven_control/configwindow.h b/app/gui/oven_control/configwindow.h index 1e31be6..a97226c 100644 --- a/app/gui/oven_control/configwindow.h +++ b/app/gui/oven_control/configwindow.h @@ -22,6 +22,8 @@ private slots: void on_backButton_clicked(); + void on_pushButton_3_clicked(); + private: Ui::ConfigWindow *ui; }; diff --git a/app/gui/oven_control/engineermenuwindow.cpp b/app/gui/oven_control/engineermenuwindow.cpp index 35e71b7..07eda01 100644 --- a/app/gui/oven_control/engineermenuwindow.cpp +++ b/app/gui/oven_control/engineermenuwindow.cpp @@ -60,4 +60,10 @@ void EngineerMenuWindow::on_engAdjustButton_clicked() w->setWindowModality(Qt::WindowModal); w->showFullScreen(); w->raise(); + +} + +void EngineerMenuWindow::on_stdConfigButton_clicked() +{ + } diff --git a/app/gui/oven_control/engineermenuwindow.h b/app/gui/oven_control/engineermenuwindow.h index 71073c8..c60c730 100644 --- a/app/gui/oven_control/engineermenuwindow.h +++ b/app/gui/oven_control/engineermenuwindow.h @@ -26,6 +26,8 @@ private slots: void on_engAdjustButton_clicked(); + void on_stdConfigButton_clicked(); + private: Ui::EngineerMenuWindow *ui; }; diff --git a/app/gui/oven_control/images/config/service/basic_setting_bgnd.png b/app/gui/oven_control/images/config/service/basic_setting_bgnd.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a90f5a4dbd0925c4d2610795ae3391f684d36e GIT binary patch literal 3135 zcmeAS@N?(olHy`uVBq!ia0y~yVAf?|U~1=J1B&!KSZ)QR*pj^6T^Rm@;DWu&Cj&(| z3p^r=85p>QL70(Y)*K0-AbW|YuPggQ7Eulb=0;I>FQD8RPZ!6Kid%1Q9ppW1z{BEb z{P+7FO~v&yCK?AHVys!S;58G2-KtGYI|R%2_yA4l5CakynUEL?QBV<7h6^_X16Txw z(U8H&zyK0KWe5O01QtPIFf3waU;v4L84g>pGC&RjOQA4Ood|a{suMxppsEuw-TL75 zvQs=jcQX_i^w&IayYaXh7!5SG6B1BISqKLyrh8EX86`;JflO4`qQpAf!>F+iPX{Qm z4o?TD(T~He6gUxk^n=}6cP(TlFrhLq@I9Nze}|*GhM$?-WQ)Vyprj2CQ6$C;prvpv za0Y6$;L;1!3Qy^n46w)GeugtpB8vL)gWat}B_ZriBql8#cON0bKbLh*2~7ZuzvXxU literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 605c7e6..0e80ef5 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -124,7 +124,7 @@ height: 33px; - :/images/animation/close_door_arrow.png + :/images/animation/close_door_arrow.png @@ -1416,7 +1416,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_horizontal.png + :/images/line/manual_core_temp_horizontal.png @@ -1432,7 +1432,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_vertical.png + :/images/line/manual_core_temp_vertical.png @@ -1448,7 +1448,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_vertical.png + :/images/line/manual_core_temp_vertical.png @@ -1464,7 +1464,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_vertical.png + :/images/line/manual_core_temp_vertical.png @@ -2335,8 +2335,6 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
animatedimagebox.h
- - - + diff --git a/app/gui/oven_control/operationtimeheat.ui b/app/gui/oven_control/operationtimeheat.ui index 35ef441..2b14532 100644 --- a/app/gui/oven_control/operationtimeheat.ui +++ b/app/gui/oven_control/operationtimeheat.ui @@ -67,7 +67,7 @@ color: rgb(255, 255, 255); - 서비스단계(엔지니어모드) > 작동시간 > 가열 + 서비스단계(엔지니어모드) > 작동시간 > 가열부 diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index d62a218..7cbc89e 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -64,7 +64,8 @@ SOURCES += main.cpp\ adjustmentwindow.cpp \ yesnopopupdlg.cpp \ configpanelbutton.cpp \ - config.cpp + config.cpp \ + basicsettingwindow.cpp HEADERS += mainwindow.h \ cook.h \ @@ -118,7 +119,8 @@ HEADERS += mainwindow.h \ adjustmentwindow.h \ yesnopopupdlg.h \ configpanelbutton.h \ - config.h + config.h \ + basicsettingwindow.h FORMS += mainwindow.ui \ manualcookwindow.ui \ @@ -150,7 +152,8 @@ FORMS += mainwindow.ui \ realtimesensorwindow.ui \ adjustmentwindow.ui \ yesnopopupdlg.ui \ - configpanelbutton.ui + configpanelbutton.ui \ + basicsettingwindow.ui RESOURCES += \ resources.qrc diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index 7d42df2..aa5e6a0 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -377,8 +377,10 @@ void OvenStatistics::oneSecTimerFired(void){ //부품 if(state.door_state !=0){ srvdata->use_log.items.door_open+=1; - realdata.b.door_open = 1; + } + + if(state.onoff_state2 !=0){ if( (state.onoff_state2 & LOAD_STATE2_DV)!=0){ srvdata->use_log.items.dv_open+=1; @@ -415,7 +417,15 @@ void OvenStatistics::oneSecTimerFired(void){ realdata.b.snv_open = (state.onoff_state2&LOAD_STATE2_SNV)==0?0:1; realdata.b.wsv_open = (state.onoff_state2&LOAD_STATE2_WSV)==0?0:1; realdata.b.ssv_open = (state.onoff_state2&LOAD_STATE2_SSV)==0?0:1; - realdata.b.water_level = 0; + if( (state.reserved11 & 0x0018) !=0){ + if( (state.reserved11&0x0008) != 0){ + realdata.b.water_level = water_level_high; + } + else if( (state.reserved11 & 0x0010) !=0){ + realdata.b.water_level = water_level_low; + } + } + else realdata.b.water_level = water_level_normal; if(srvdata->sensor_log.items.B1.high_temp.itemp < state.sensor1 ){ srvdata->sensor_log.items.B1.high_temp.itemp = state.sensor1; diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index 997b923..df24c2a 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -143,6 +143,12 @@ enum wash_mode_type{ wash_mode_highspeed }; +enum water_level_state{ + water_level_normal = 0, + water_level_low, + water_level_high +}; + typedef union { diff --git a/app/gui/oven_control/realtimepartswindow.cpp b/app/gui/oven_control/realtimepartswindow.cpp index 12d7211..76367fc 100644 --- a/app/gui/oven_control/realtimepartswindow.cpp +++ b/app/gui/oven_control/realtimepartswindow.cpp @@ -47,10 +47,18 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : reloadUi(); + timer = new QTimer(this); + connect(timer, SIGNAL(timeout()),this,SLOT(oneSecTimerFired())); + timer->start(1000); //1000ms fired + } + + RealtimePartsWindow::~RealtimePartsWindow() { + timer->stop(); + delete timer; delete ui; } @@ -77,8 +85,15 @@ void RealtimePartsWindow::reloadUi(void){ if(realdata.b.snv_open) ui->m_ctrlLbListState_1_3->setText(tr("ON")); else ui->m_ctrlLbListState_1_3->setText(tr("OFF")); - strTemp.sprintf("%d",realdata.b.water_level); - ui->m_ctrlLbListState_1_4->setText(strTemp); + //strTemp.sprintf("%d",realdata.b.water_level); + //ui->m_ctrlLbListState_1_4->setText(strTemp); + if(realdata.b.water_level == water_level_high){ + ui->m_ctrlLbListState_1_4->setText(tr("HIGH")); + } + else if(realdata.b.water_level == water_level_low){ + ui->m_ctrlLbListState_1_4->setText(tr("LOW")); + } + else ui->m_ctrlLbListState_1_4->setText(tr("NORMAL")); if(realdata.b.sgnv_open) ui->m_ctrlLbListState_1_5->setText(tr("ON")); else ui->m_ctrlLbListState_1_5->setText(tr("OFF")); @@ -93,6 +108,8 @@ void RealtimePartsWindow::reloadUi(void){ else ui->m_ctrlLbListState_1_8->setText(tr("OFF")); + + for(i=1;isetText("-"); @@ -100,3 +117,7 @@ void RealtimePartsWindow::reloadUi(void){ } } + +void RealtimePartsWindow::oneSecTimerFired(void){ + reloadUi(); +} diff --git a/app/gui/oven_control/realtimepartswindow.h b/app/gui/oven_control/realtimepartswindow.h index a0bf686..76f8b1d 100644 --- a/app/gui/oven_control/realtimepartswindow.h +++ b/app/gui/oven_control/realtimepartswindow.h @@ -22,10 +22,12 @@ public: private slots: void on_backButton_clicked(); + void oneSecTimerFired(void); private: Ui::RealtimePartsWindow *ui; QLabel *m_arrLbState[CONTROL_LIST_COL_MAX][CONTROL_LIST_ITEM_MAX]; + QTimer *timer; void reloadUi(void); }; diff --git a/app/gui/oven_control/realtimesensorwindow.cpp b/app/gui/oven_control/realtimesensorwindow.cpp index 88a1835..b982cd1 100644 --- a/app/gui/oven_control/realtimesensorwindow.cpp +++ b/app/gui/oven_control/realtimesensorwindow.cpp @@ -58,10 +58,15 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : m_arrSensorItems[i] = &(ovs->srvdata->sensor_log.values[m_arrSensorItemIdxs[i]]); } reloadUi(); + timer = new QTimer(this); + connect(timer, SIGNAL(timeout()),this,SLOT(oneSecTimerFired())); + timer->start(1000); //1000ms fired } RealtimeSensorWindow::~RealtimeSensorWindow() { + timer->stop(); + delete timer; delete ui; } @@ -125,3 +130,7 @@ void RealtimeSensorWindow::reloadUi(void){ } } + +void RealtimeSensorWindow::oneSecTimerFired(void){ + reloadUi(); +} diff --git a/app/gui/oven_control/realtimesensorwindow.h b/app/gui/oven_control/realtimesensorwindow.h index 58cb95c..a0a8bed 100644 --- a/app/gui/oven_control/realtimesensorwindow.h +++ b/app/gui/oven_control/realtimesensorwindow.h @@ -22,6 +22,7 @@ public: private slots: void on_backButton_clicked(); + void oneSecTimerFired(void); private: const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={ @@ -34,7 +35,7 @@ private: Ui::RealtimeSensorWindow *ui; QLabel *m_arrLbState[REALSENSOR_CONTROL_LIST_COL_MAX][REALSENSOR_CONTROL_LIST_ITEM_MAX]; sensor_log_item* m_arrSensorItems[REALSENSOR_CONTROL_LIST_ITEM_MAX]; - + QTimer *timer; void reloadUi(void); }; diff --git a/app/gui/oven_control/resources.qrc b/app/gui/oven_control/resources.qrc index 5d8a35f..939543b 100644 --- a/app/gui/oven_control/resources.qrc +++ b/app/gui/oven_control/resources.qrc @@ -432,5 +432,6 @@ images/config/service/realtime_parts_bgnd.png images/config/service/realtime_sensor_bgnd.png images/config/service/adjustment_line.png + images/config/service/basic_setting_bgnd.png