에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 42410a75c255a02bc294bfd948afee10b3116897

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

오타 수정

Showing 10 changed files with 47 additions and 47 deletions   Show diff stats
app/gui/oven_control/historylistwindow.cpp
  Diff comments   View file @42410a7
@@ -116,7 +116,7 @@ void historyListWindow::reloadDataset(void){ @@ -116,7 +116,7 @@ void historyListWindow::reloadDataset(void){
116 } 116 }
117 117
118 void historyListWindow::setUpperBunnerDataSet(void){ 118 void historyListWindow::setUpperBunnerDataSet(void){
119 - OvenStatics *ovenst = OvenStatics::getInstance(); 119 + OvenStatistics *ovenst = OvenStatistics::getInstance();
120 m_nCurDpStartPos = 0; 120 m_nCurDpStartPos = 0;
121 m_nCurSelPos = 0; 121 m_nCurSelPos = 0;
122 int i = 0; 122 int i = 0;
@@ -132,7 +132,7 @@ void historyListWindow::setUpperBunnerDataSet(void){ @@ -132,7 +132,7 @@ void historyListWindow::setUpperBunnerDataSet(void){
132 } 132 }
133 133
134 void historyListWindow::setSteamBunnerDataSet(void){ 134 void historyListWindow::setSteamBunnerDataSet(void){
135 - OvenStatics *ovenst = OvenStatics::getInstance(); 135 + OvenStatistics *ovenst = OvenStatistics::getInstance();
136 m_nCurDpStartPos = 0; 136 m_nCurDpStartPos = 0;
137 m_nCurSelPos = 0; 137 m_nCurSelPos = 0;
138 int i = 0; 138 int i = 0;
@@ -148,7 +148,7 @@ void historyListWindow::setSteamBunnerDataSet(void){ @@ -148,7 +148,7 @@ void historyListWindow::setSteamBunnerDataSet(void){
148 } 148 }
149 149
150 void historyListWindow::setLowerBunnerDataSet(void){ 150 void historyListWindow::setLowerBunnerDataSet(void){
151 - OvenStatics *ovenst = OvenStatics::getInstance(); 151 + OvenStatistics *ovenst = OvenStatistics::getInstance();
152 m_nCurDpStartPos = 0; 152 m_nCurDpStartPos = 0;
153 m_nCurSelPos = 0; 153 m_nCurSelPos = 0;
154 int i = 0; 154 int i = 0;
@@ -168,7 +168,7 @@ void historyListWindow::setTotalServiceDataSet(void){ @@ -168,7 +168,7 @@ void historyListWindow::setTotalServiceDataSet(void){
168 error_item *item; 168 error_item *item;
169 time_t firsttimebuf=0,lasttimebuf=0; 169 time_t firsttimebuf=0,lasttimebuf=0;
170 uint16_t firecntbuf=0; 170 uint16_t firecntbuf=0;
171 - OvenStatics *ovenst = OvenStatics::getInstance(); 171 + OvenStatistics *ovenst = OvenStatistics::getInstance();
172 QString strName = tr("서비스단계(엔지니어모드)>서비스기록>"); 172 QString strName = tr("서비스단계(엔지니어모드)>서비스기록>");
173 strName.append(tr(m_strWindowName[ERROR_HISTORY_TOTAL ])); 173 strName.append(tr(m_strWindowName[ERROR_HISTORY_TOTAL ]));
174 m_ctrlErrorNameLabel->setText(strName); 174 m_ctrlErrorNameLabel->setText(strName);
@@ -342,7 +342,7 @@ void historyListWindow::on_ctrflDownBtn_clicked() @@ -342,7 +342,7 @@ void historyListWindow::on_ctrflDownBtn_clicked()
342 void historyListWindow::on_ctrlResetBtn_clicked() 342 void historyListWindow::on_ctrlResetBtn_clicked()
343 { 343 {
344 int i = 0; 344 int i = 0;
345 - OvenStatics *ovenst = OvenStatics::getInstance(); 345 + OvenStatistics *ovenst = OvenStatistics::getInstance();
346 for(i=0;i<MAX_ERROR_TYPE_CNT;i++){ 346 for(i=0;i<MAX_ERROR_TYPE_CNT;i++){
347 ovenst->srvdatas->err_log.values[i].fired_cnt = 0; 347 ovenst->srvdatas->err_log.values[i].fired_cnt = 0;
348 ovenst->srvdatas->err_log.values[i].first_fired = 0; 348 ovenst->srvdatas->err_log.values[i].first_fired = 0;
app/gui/oven_control/mainwindow.cpp
  Diff comments   View file @42410a7
@@ -29,7 +29,7 @@ MainWindow::MainWindow(QWidget *parent) : @@ -29,7 +29,7 @@ MainWindow::MainWindow(QWidget *parent) :
29 qDebug() << udp->init(); 29 qDebug() << udp->init();
30 interface->setUdpHandler(udp); 30 interface->setUdpHandler(udp);
31 31
32 - ovenStatics = OvenStatics::getInstance(this,udp,oven); 32 + ovenStatistics = OvenStatistics::getInstance(this,udp,oven);
33 33
34 QSignalMapper *sm = new QSignalMapper(this); 34 QSignalMapper *sm = new QSignalMapper(this);
35 sm->setMapping(ui->steamButton, (int) Oven::SteamMode); 35 sm->setMapping(ui->steamButton, (int) Oven::SteamMode);
app/gui/oven_control/mainwindow.h
  Diff comments   View file @42410a7
@@ -45,7 +45,7 @@ private: @@ -45,7 +45,7 @@ private:
45 45
46 Oven *oven; 46 Oven *oven;
47 UdpHandler *udp; 47 UdpHandler *udp;
48 - OvenStatics* ovenStatics; 48 + OvenStatistics* ovenStatistics;
49 }; 49 };
50 50
51 #endif // MAINWINDOW_H 51 #endif // MAINWINDOW_H
app/gui/oven_control/operationtimeheat.cpp
  Diff comments   View file @42410a7
@@ -19,7 +19,7 @@ operationTimeHeat::~operationTimeHeat() @@ -19,7 +19,7 @@ operationTimeHeat::~operationTimeHeat()
19 void operationTimeHeat::on_btnReset1_clicked() 19 void operationTimeHeat::on_btnReset1_clicked()
20 { 20 {
21 //스팀 가열 시간 초기화 21 //스팀 가열 시간 초기화
22 - OvenStatics* ovs = OvenStatics::getInstance(); 22 + OvenStatistics* ovs = OvenStatistics::getInstance();
23 if(ovs!=NULL){ 23 if(ovs!=NULL){
24 ovs->srvdatas->use_log.items.steam_heat=0; 24 ovs->srvdatas->use_log.items.steam_heat=0;
25 ovs->srvdatas->saveServiceDatas(); 25 ovs->srvdatas->saveServiceDatas();
@@ -30,7 +30,7 @@ void operationTimeHeat::on_btnReset1_clicked() @@ -30,7 +30,7 @@ void operationTimeHeat::on_btnReset1_clicked()
30 void operationTimeHeat::on_btnReset2_clicked() 30 void operationTimeHeat::on_btnReset2_clicked()
31 { 31 {
32 //건열 가열 시간 초기화 32 //건열 가열 시간 초기화
33 - OvenStatics* ovs = OvenStatics::getInstance(); 33 + OvenStatistics* ovs = OvenStatistics::getInstance();
34 if(ovs!=NULL){ 34 if(ovs!=NULL){
35 ovs->srvdatas->use_log.items.dry_heat=0; 35 ovs->srvdatas->use_log.items.dry_heat=0;
36 ovs->srvdatas->use_log.items.upper_heat=0; 36 ovs->srvdatas->use_log.items.upper_heat=0;
@@ -42,7 +42,7 @@ void operationTimeHeat::on_btnReset2_clicked() @@ -42,7 +42,7 @@ void operationTimeHeat::on_btnReset2_clicked()
42 42
43 void operationTimeHeat::reloadUI(void){ 43 void operationTimeHeat::reloadUI(void){
44 uint32_t timetemp; 44 uint32_t timetemp;
45 - OvenStatics* ovs = OvenStatics::getInstance(); 45 + OvenStatistics* ovs = OvenStatistics::getInstance();
46 QString strTemp=""; 46 QString strTemp="";
47 if(ovs!=NULL){ 47 if(ovs!=NULL){
48 timetemp = ovs->srvdatas->use_log.items.steam_heat; 48 timetemp = ovs->srvdatas->use_log.items.steam_heat;
app/gui/oven_control/operationtimemode.cpp
  Diff comments   View file @42410a7
@@ -23,7 +23,7 @@ void operationTimeMode::on_backButton_clicked() @@ -23,7 +23,7 @@ void operationTimeMode::on_backButton_clicked()
23 23
24 void operationTimeMode::reloadUi(void){ 24 void operationTimeMode::reloadUi(void){
25 uint32_t timetemp; 25 uint32_t timetemp;
26 - OvenStatics* ovs = OvenStatics::getInstance(); 26 + OvenStatistics* ovs = OvenStatistics::getInstance();
27 QString strTemp=""; 27 QString strTemp="";
28 uint32_t totaltime; 28 uint32_t totaltime;
29 if(ovs!=NULL){ 29 if(ovs!=NULL){
app/gui/oven_control/operationtimeparts.cpp
  Diff comments   View file @42410a7
@@ -8,7 +8,7 @@ operationTimeParts::operationTimeParts(QWidget *parent) : @@ -8,7 +8,7 @@ operationTimeParts::operationTimeParts(QWidget *parent) :
8 ui(new Ui::operationTimeParts) 8 ui(new Ui::operationTimeParts)
9 { 9 {
10 int i=0; 10 int i=0;
11 - OvenStatics* ovs = OvenStatics::getInstance(); 11 + OvenStatistics* ovs = OvenStatistics::getInstance();
12 ui->setupUi(this); 12 ui->setupUi(this);
13 13
14 m_arrTimeLabels[0] = ui->m_ctrlLbListTime_1; 14 m_arrTimeLabels[0] = ui->m_ctrlLbListTime_1;
@@ -67,7 +67,7 @@ void operationTimeParts::on_backButton_clicked() @@ -67,7 +67,7 @@ void operationTimeParts::on_backButton_clicked()
67 67
68 void operationTimeParts::reloadUi(void){ 68 void operationTimeParts::reloadUi(void){
69 uint32_t timetemp; 69 uint32_t timetemp;
70 - OvenStatics* ovs = OvenStatics::getInstance(); 70 + OvenStatistics* ovs = OvenStatistics::getInstance();
71 QString strTemp=""; 71 QString strTemp="";
72 int i = 0; 72 int i = 0;
73 73
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @42410a7
@@ -9,32 +9,32 @@ @@ -9,32 +9,32 @@
9 #include "errorpopupdlg.h" 9 #include "errorpopupdlg.h"
10 #include "historylistwindow.h" 10 #include "historylistwindow.h"
11 11
12 -OvenStatics* OvenStatics::p_singtonInstance=NULL; 12 +OvenStatistics* OvenStatistics::p_singletonInstance=NULL;
13 13
14 -OvenStatics* OvenStatics::getInstance(QObject *parent, UdpHandler* udp, Oven* oven){  
15 - if(!p_singtonInstance){ 14 +OvenStatistics* OvenStatistics::getInstance(QObject *parent, UdpHandler* udp, Oven* oven){
  15 + if(!p_singletonInstance){
16 if(udp==NULL) return NULL; 16 if(udp==NULL) return NULL;
17 - p_singtonInstance = new OvenStatics(parent);  
18 - p_singtonInstance->udp = udp;  
19 - p_singtonInstance->oven = oven; 17 + p_singletonInstance = new OvenStatistics(parent);
  18 + p_singletonInstance->udp = udp;
  19 + p_singletonInstance->oven = oven;
20 //for singletone event debug 20 //for singletone event debug
21 // MainWindow* mw = (MainWindow*)parent; 21 // MainWindow* mw = (MainWindow*)parent;
22 // connect(mw->pcombiButton, SIGNAL(clicked()),p_singtonInstance, SLOT(onDataChanged())); 22 // connect(mw->pcombiButton, SIGNAL(clicked()),p_singtonInstance, SLOT(onDataChanged()));
23 - connect(p_singtonInstance->udp , SIGNAL(changed()), p_singtonInstance, SLOT(onDataChanged()));  
24 - QTimer *timer = new QTimer(p_singtonInstance);  
25 - connect(timer, SIGNAL(timeout()),p_singtonInstance,SLOT(oneSecTimerFired())); 23 + connect(p_singletonInstance->udp , SIGNAL(changed()), p_singletonInstance, SLOT(onDataChanged()));
  24 + QTimer *timer = new QTimer(p_singletonInstance);
  25 + connect(timer, SIGNAL(timeout()),p_singletonInstance,SLOT(oneSecTimerFired()));
26 timer->start(1000); //1000ms fired 26 timer->start(1000); //1000ms fired
27 } 27 }
28 - return p_singtonInstance; 28 + return p_singletonInstance;
29 } 29 }
30 30
31 -void OvenStatics::destroy(){  
32 - if(!p_singtonInstance)  
33 - delete p_singtonInstance; 31 +void OvenStatistics::destroy(){
  32 + if(!p_singletonInstance)
  33 + delete p_singletonInstance;
34 } 34 }
35 35
36 36
37 -OvenStatics::OvenStatics(QObject* parent) :QObject(parent) 37 +OvenStatistics::OvenStatistics(QObject* parent) :QObject(parent)
38 { 38 {
39 int i = 0; 39 int i = 0;
40 curdoorstate = false; 40 curdoorstate = false;
@@ -54,12 +54,12 @@ OvenStatics::OvenStatics(QObject* parent) :QObject(parent) @@ -54,12 +54,12 @@ OvenStatics::OvenStatics(QObject* parent) :QObject(parent)
54 srvdatas->loadServiceDatas(); 54 srvdatas->loadServiceDatas();
55 } 55 }
56 56
57 -OvenStatics::~OvenStatics(){ 57 +OvenStatistics::~OvenStatistics(){
58 delete srvdatas; 58 delete srvdatas;
59 } 59 }
60 60
61 61
62 -void OvenStatics::onDataChanged() 62 +void OvenStatistics::onDataChanged()
63 { 63 {
64 error_item *item; 64 error_item *item;
65 time_t ltime=0; 65 time_t ltime=0;
@@ -102,7 +102,7 @@ void OvenStatics::onDataChanged() @@ -102,7 +102,7 @@ void OvenStatics::onDataChanged()
102 102
103 } 103 }
104 104
105 -void OvenStatics::processSensorError(uint16_t errflag, time_t ltime){ 105 +void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){
106 error_item *item; 106 error_item *item;
107 QString strMsg = "",strTitle=""; 107 QString strMsg = "",strTitle="";
108 uint8_t state; 108 uint8_t state;
@@ -177,7 +177,7 @@ void OvenStatics::processSensorError(uint16_t errflag, time_t ltime){ @@ -177,7 +177,7 @@ void OvenStatics::processSensorError(uint16_t errflag, time_t ltime){
177 } 177 }
178 } 178 }
179 179
180 -void OvenStatics::processCommError(uint16_t errflag, time_t ltime){ 180 +void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){
181 error_item *item; 181 error_item *item;
182 QString strMsg = "",strTitle=""; 182 QString strMsg = "",strTitle="";
183 uint8_t state; 183 uint8_t state;
@@ -218,7 +218,7 @@ void OvenStatics::processCommError(uint16_t errflag, time_t ltime){ @@ -218,7 +218,7 @@ void OvenStatics::processCommError(uint16_t errflag, time_t ltime){
218 } 218 }
219 } 219 }
220 220
221 -void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){ 221 +void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){
222 error_item *item; 222 error_item *item;
223 QString strMsg = "",strTitle = ""; 223 QString strMsg = "",strTitle = "";
224 uint8_t state; 224 uint8_t state;
@@ -298,16 +298,16 @@ void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){ @@ -298,16 +298,16 @@ void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){
298 298
299 299
300 300
301 -bool OvenStatics::getNeedErrorClear(){ 301 +bool OvenStatistics::getNeedErrorClear(){
302 return bNeedErrorClear; 302 return bNeedErrorClear;
303 } 303 }
304 304
305 -void OvenStatics::clearNeedErrorClear(){ 305 +void OvenStatistics::clearNeedErrorClear(){
306 //에러클리어 송신 후 flag clear 306 //에러클리어 송신 후 flag clear
307 bNeedErrorClear = false; 307 bNeedErrorClear = false;
308 } 308 }
309 309
310 -void OvenStatics::oneSecTimerFired(void){ 310 +void OvenStatistics::oneSecTimerFired(void){
311 static int nOneSecCnt=1; 311 static int nOneSecCnt=1;
312 time_t ltime; 312 time_t ltime;
313 313
@@ -492,7 +492,7 @@ void OvenStatics::oneSecTimerFired(void){ @@ -492,7 +492,7 @@ void OvenStatics::oneSecTimerFired(void){
492 492
493 } 493 }
494 494
495 -void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, const QString &MsgTitle, time_t ltime){ 495 +void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, const QString &MsgTitle, time_t ltime){
496 496
497 qDebug() << (int) (item - &(srvdatas->err_log.values[0])) << "ERROR Fired!"; 497 qDebug() << (int) (item - &(srvdatas->err_log.values[0])) << "ERROR Fired!";
498 if(m_pLastErrItem == item ){ 498 if(m_pLastErrItem == item ){
@@ -542,15 +542,15 @@ void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, co @@ -542,15 +542,15 @@ void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, co
542 542
543 } 543 }
544 544
545 -realtime_data OvenStatics::getPartsRealtimeData(void){ 545 +realtime_data OvenStatistics::getPartsRealtimeData(void){
546 return realdata; 546 return realdata;
547 } 547 }
548 548
549 -uint8_t OvenStatics::getSensorTypeByIdx(uint16_t idx){ 549 +uint8_t OvenStatistics::getSensorTypeByIdx(uint16_t idx){
550 if(idx > MAX_LOG_SENSOR) return 0; 550 if(idx > MAX_LOG_SENSOR) return 0;
551 return sensorTypeInfo[idx]; 551 return sensorTypeInfo[idx];
552 } 552 }
553 553
554 -type_temp OvenStatics::getCurSensorValueByIdx(uint16_t idx){ 554 +type_temp OvenStatistics::getCurSensorValueByIdx(uint16_t idx){
555 return curSensorValue[idx]; 555 return curSensorValue[idx];
556 } 556 }
app/gui/oven_control/ovenstatics.h
  Diff comments   View file @42410a7
@@ -160,13 +160,13 @@ typedef union @@ -160,13 +160,13 @@ typedef union
160 }b; 160 }b;
161 }realtime_data; 161 }realtime_data;
162 162
163 -class OvenStatics : public QObject 163 +class OvenStatistics : public QObject
164 { 164 {
165 Q_OBJECT 165 Q_OBJECT
166 public: 166 public:
167 servicedatas* srvdatas; 167 servicedatas* srvdatas;
168 168
169 - static OvenStatics* getInstance(QObject* parent = 0,UdpHandler * udp=0, Oven* oven=0); 169 + static OvenStatistics* getInstance(QObject* parent = 0,UdpHandler * udp=0, Oven* oven=0);
170 static void destroy(); 170 static void destroy();
171 bool getNeedErrorClear(); 171 bool getNeedErrorClear();
172 void clearNeedErrorClear(); 172 void clearNeedErrorClear();
@@ -213,7 +213,7 @@ private: @@ -213,7 +213,7 @@ private:
213 type_temp curSensorValue[MAX_LOG_SENSOR]; 213 type_temp curSensorValue[MAX_LOG_SENSOR];
214 214
215 215
216 - static OvenStatics* p_singtonInstance; 216 + static OvenStatistics* p_singletonInstance;
217 UdpHandler *udp; 217 UdpHandler *udp;
218 Oven* oven; 218 Oven* oven;
219 oven_control_t control; 219 oven_control_t control;
@@ -229,8 +229,8 @@ private: @@ -229,8 +229,8 @@ private:
229 bool bNeedErrorClear; 229 bool bNeedErrorClear;
230 bool bDataRefreshed; 230 bool bDataRefreshed;
231 realtime_data realdata; 231 realtime_data realdata;
232 - explicit OvenStatics(QObject* parent);  
233 - ~OvenStatics(); 232 + explicit OvenStatistics(QObject* parent);
  233 + ~OvenStatistics();
234 void processSystemError(uint16_t errflag,time_t ltime); 234 void processSystemError(uint16_t errflag,time_t ltime);
235 void processCommError(uint16_t errflag,time_t ltime); 235 void processCommError(uint16_t errflag,time_t ltime);
236 void processSensorError(uint16_t errflag, time_t ltime); 236 void processSensorError(uint16_t errflag, time_t ltime);
app/gui/oven_control/realtimepartswindow.cpp
  Diff comments   View file @42410a7
@@ -57,7 +57,7 @@ void realtimePartsWindow::on_backButton_clicked() @@ -57,7 +57,7 @@ void realtimePartsWindow::on_backButton_clicked()
57 } 57 }
58 58
59 void realtimePartsWindow::reloadUi(void){ 59 void realtimePartsWindow::reloadUi(void){
60 - OvenStatics* ovs = OvenStatics::getInstance(); 60 + OvenStatistics* ovs = OvenStatistics::getInstance();
61 QString strTemp = ""; 61 QString strTemp = "";
62 int i = 0,j=0; 62 int i = 0,j=0;
63 realtime_data realdata; 63 realtime_data realdata;
app/gui/oven_control/realtimesensorwindow.cpp
  Diff comments   View file @42410a7
@@ -6,7 +6,7 @@ realtimeSensorWindow::realtimeSensorWindow(QWidget *parent) : @@ -6,7 +6,7 @@ realtimeSensorWindow::realtimeSensorWindow(QWidget *parent) :
6 QMainWindow(parent), 6 QMainWindow(parent),
7 ui(new Ui::realtimeSensorWindow) 7 ui(new Ui::realtimeSensorWindow)
8 { 8 {
9 - OvenStatics* ovs = OvenStatics::getInstance(); 9 + OvenStatistics* ovs = OvenStatistics::getInstance();
10 int i = 0; 10 int i = 0;
11 ui->setupUi(this); 11 ui->setupUi(this);
12 12
@@ -74,7 +74,7 @@ void realtimeSensorWindow::reloadUi(void){ @@ -74,7 +74,7 @@ void realtimeSensorWindow::reloadUi(void){
74 QString strTemp=""; 74 QString strTemp="";
75 struct tm *timeptr; 75 struct tm *timeptr;
76 int i = 0; 76 int i = 0;
77 - OvenStatics* ovs = OvenStatics::getInstance(); 77 + OvenStatistics* ovs = OvenStatistics::getInstance();
78 if(ovs!= NULL){ 78 if(ovs!= NULL){
79 for(i=0;i<REALSENSOR_CONTROL_LIST_ITEM_MAX;i++){ 79 for(i=0;i<REALSENSOR_CONTROL_LIST_ITEM_MAX;i++){
80 i_temp1 = i; 80 i_temp1 = i;