From 42410a75c255a02bc294bfd948afee10b3116897 Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 19 Apr 2017 17:25:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/historylistwindow.cpp | 10 +++--- app/gui/oven_control/mainwindow.cpp | 2 +- app/gui/oven_control/mainwindow.h | 2 +- app/gui/oven_control/operationtimeheat.cpp | 6 ++-- app/gui/oven_control/operationtimemode.cpp | 2 +- app/gui/oven_control/operationtimeparts.cpp | 4 +-- app/gui/oven_control/ovenstatics.cpp | 52 +++++++++++++-------------- app/gui/oven_control/ovenstatics.h | 10 +++--- app/gui/oven_control/realtimepartswindow.cpp | 2 +- app/gui/oven_control/realtimesensorwindow.cpp | 4 +-- 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/gui/oven_control/historylistwindow.cpp b/app/gui/oven_control/historylistwindow.cpp index 6643787..5af755c 100644 --- a/app/gui/oven_control/historylistwindow.cpp +++ b/app/gui/oven_control/historylistwindow.cpp @@ -116,7 +116,7 @@ void historyListWindow::reloadDataset(void){ } void historyListWindow::setUpperBunnerDataSet(void){ - OvenStatics *ovenst = OvenStatics::getInstance(); + OvenStatistics *ovenst = OvenStatistics::getInstance(); m_nCurDpStartPos = 0; m_nCurSelPos = 0; int i = 0; @@ -132,7 +132,7 @@ void historyListWindow::setUpperBunnerDataSet(void){ } void historyListWindow::setSteamBunnerDataSet(void){ - OvenStatics *ovenst = OvenStatics::getInstance(); + OvenStatistics *ovenst = OvenStatistics::getInstance(); m_nCurDpStartPos = 0; m_nCurSelPos = 0; int i = 0; @@ -148,7 +148,7 @@ void historyListWindow::setSteamBunnerDataSet(void){ } void historyListWindow::setLowerBunnerDataSet(void){ - OvenStatics *ovenst = OvenStatics::getInstance(); + OvenStatistics *ovenst = OvenStatistics::getInstance(); m_nCurDpStartPos = 0; m_nCurSelPos = 0; int i = 0; @@ -168,7 +168,7 @@ void historyListWindow::setTotalServiceDataSet(void){ error_item *item; time_t firsttimebuf=0,lasttimebuf=0; uint16_t firecntbuf=0; - OvenStatics *ovenst = OvenStatics::getInstance(); + OvenStatistics *ovenst = OvenStatistics::getInstance(); QString strName = tr("서비스단계(엔지니어모드)>서비스기록>"); strName.append(tr(m_strWindowName[ERROR_HISTORY_TOTAL ])); m_ctrlErrorNameLabel->setText(strName); @@ -342,7 +342,7 @@ void historyListWindow::on_ctrflDownBtn_clicked() void historyListWindow::on_ctrlResetBtn_clicked() { int i = 0; - OvenStatics *ovenst = OvenStatics::getInstance(); + OvenStatistics *ovenst = OvenStatistics::getInstance(); for(i=0;isrvdatas->err_log.values[i].fired_cnt = 0; ovenst->srvdatas->err_log.values[i].first_fired = 0; diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp index cbdf8f1..cbb7ef9 100644 --- a/app/gui/oven_control/mainwindow.cpp +++ b/app/gui/oven_control/mainwindow.cpp @@ -29,7 +29,7 @@ MainWindow::MainWindow(QWidget *parent) : qDebug() << udp->init(); interface->setUdpHandler(udp); - ovenStatics = OvenStatics::getInstance(this,udp,oven); + ovenStatistics = OvenStatistics::getInstance(this,udp,oven); QSignalMapper *sm = new QSignalMapper(this); sm->setMapping(ui->steamButton, (int) Oven::SteamMode); diff --git a/app/gui/oven_control/mainwindow.h b/app/gui/oven_control/mainwindow.h index e2d8abb..d38bee1 100644 --- a/app/gui/oven_control/mainwindow.h +++ b/app/gui/oven_control/mainwindow.h @@ -45,7 +45,7 @@ private: Oven *oven; UdpHandler *udp; - OvenStatics* ovenStatics; + OvenStatistics* ovenStatistics; }; #endif // MAINWINDOW_H diff --git a/app/gui/oven_control/operationtimeheat.cpp b/app/gui/oven_control/operationtimeheat.cpp index 5f1141e..c8e9668 100644 --- a/app/gui/oven_control/operationtimeheat.cpp +++ b/app/gui/oven_control/operationtimeheat.cpp @@ -19,7 +19,7 @@ operationTimeHeat::~operationTimeHeat() void operationTimeHeat::on_btnReset1_clicked() { //스팀 가열 시간 초기화 - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); if(ovs!=NULL){ ovs->srvdatas->use_log.items.steam_heat=0; ovs->srvdatas->saveServiceDatas(); @@ -30,7 +30,7 @@ void operationTimeHeat::on_btnReset1_clicked() void operationTimeHeat::on_btnReset2_clicked() { //건열 가열 시간 초기화 - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); if(ovs!=NULL){ ovs->srvdatas->use_log.items.dry_heat=0; ovs->srvdatas->use_log.items.upper_heat=0; @@ -42,7 +42,7 @@ void operationTimeHeat::on_btnReset2_clicked() void operationTimeHeat::reloadUI(void){ uint32_t timetemp; - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); QString strTemp=""; if(ovs!=NULL){ timetemp = ovs->srvdatas->use_log.items.steam_heat; diff --git a/app/gui/oven_control/operationtimemode.cpp b/app/gui/oven_control/operationtimemode.cpp index d1200bd..d9201fd 100644 --- a/app/gui/oven_control/operationtimemode.cpp +++ b/app/gui/oven_control/operationtimemode.cpp @@ -23,7 +23,7 @@ void operationTimeMode::on_backButton_clicked() void operationTimeMode::reloadUi(void){ uint32_t timetemp; - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); QString strTemp=""; uint32_t totaltime; if(ovs!=NULL){ diff --git a/app/gui/oven_control/operationtimeparts.cpp b/app/gui/oven_control/operationtimeparts.cpp index a36c593..fe894d6 100644 --- a/app/gui/oven_control/operationtimeparts.cpp +++ b/app/gui/oven_control/operationtimeparts.cpp @@ -8,7 +8,7 @@ operationTimeParts::operationTimeParts(QWidget *parent) : ui(new Ui::operationTimeParts) { int i=0; - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); ui->setupUi(this); m_arrTimeLabels[0] = ui->m_ctrlLbListTime_1; @@ -67,7 +67,7 @@ void operationTimeParts::on_backButton_clicked() void operationTimeParts::reloadUi(void){ uint32_t timetemp; - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); QString strTemp=""; int i = 0; diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index 524fedb..4a7ffe9 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -9,32 +9,32 @@ #include "errorpopupdlg.h" #include "historylistwindow.h" -OvenStatics* OvenStatics::p_singtonInstance=NULL; +OvenStatistics* OvenStatistics::p_singletonInstance=NULL; -OvenStatics* OvenStatics::getInstance(QObject *parent, UdpHandler* udp, Oven* oven){ - if(!p_singtonInstance){ +OvenStatistics* OvenStatistics::getInstance(QObject *parent, UdpHandler* udp, Oven* oven){ + if(!p_singletonInstance){ if(udp==NULL) return NULL; - p_singtonInstance = new OvenStatics(parent); - p_singtonInstance->udp = udp; - p_singtonInstance->oven = oven; + p_singletonInstance = new OvenStatistics(parent); + p_singletonInstance->udp = udp; + p_singletonInstance->oven = oven; //for singletone event debug // MainWindow* mw = (MainWindow*)parent; // connect(mw->pcombiButton, SIGNAL(clicked()),p_singtonInstance, SLOT(onDataChanged())); - connect(p_singtonInstance->udp , SIGNAL(changed()), p_singtonInstance, SLOT(onDataChanged())); - QTimer *timer = new QTimer(p_singtonInstance); - connect(timer, SIGNAL(timeout()),p_singtonInstance,SLOT(oneSecTimerFired())); + connect(p_singletonInstance->udp , SIGNAL(changed()), p_singletonInstance, SLOT(onDataChanged())); + QTimer *timer = new QTimer(p_singletonInstance); + connect(timer, SIGNAL(timeout()),p_singletonInstance,SLOT(oneSecTimerFired())); timer->start(1000); //1000ms fired } - return p_singtonInstance; + return p_singletonInstance; } -void OvenStatics::destroy(){ - if(!p_singtonInstance) - delete p_singtonInstance; +void OvenStatistics::destroy(){ + if(!p_singletonInstance) + delete p_singletonInstance; } -OvenStatics::OvenStatics(QObject* parent) :QObject(parent) +OvenStatistics::OvenStatistics(QObject* parent) :QObject(parent) { int i = 0; curdoorstate = false; @@ -54,12 +54,12 @@ OvenStatics::OvenStatics(QObject* parent) :QObject(parent) srvdatas->loadServiceDatas(); } -OvenStatics::~OvenStatics(){ +OvenStatistics::~OvenStatistics(){ delete srvdatas; } -void OvenStatics::onDataChanged() +void OvenStatistics::onDataChanged() { error_item *item; time_t ltime=0; @@ -102,7 +102,7 @@ void OvenStatics::onDataChanged() } -void OvenStatics::processSensorError(uint16_t errflag, time_t ltime){ +void OvenStatistics::processSensorError(uint16_t errflag, time_t ltime){ error_item *item; QString strMsg = "",strTitle=""; uint8_t state; @@ -177,7 +177,7 @@ void OvenStatics::processSensorError(uint16_t errflag, time_t ltime){ } } -void OvenStatics::processCommError(uint16_t errflag, time_t ltime){ +void OvenStatistics::processCommError(uint16_t errflag, time_t ltime){ error_item *item; QString strMsg = "",strTitle=""; uint8_t state; @@ -218,7 +218,7 @@ void OvenStatics::processCommError(uint16_t errflag, time_t ltime){ } } -void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){ +void OvenStatistics::processSystemError(uint16_t errflag,time_t ltime){ error_item *item; QString strMsg = "",strTitle = ""; uint8_t state; @@ -298,16 +298,16 @@ void OvenStatics::processSystemError(uint16_t errflag,time_t ltime){ -bool OvenStatics::getNeedErrorClear(){ +bool OvenStatistics::getNeedErrorClear(){ return bNeedErrorClear; } -void OvenStatics::clearNeedErrorClear(){ +void OvenStatistics::clearNeedErrorClear(){ //에러클리어 송신 후 flag clear bNeedErrorClear = false; } -void OvenStatics::oneSecTimerFired(void){ +void OvenStatistics::oneSecTimerFired(void){ static int nOneSecCnt=1; time_t ltime; @@ -492,7 +492,7 @@ void OvenStatics::oneSecTimerFired(void){ } -void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, const QString &MsgTitle, time_t ltime){ +void OvenStatistics::processErrorItems(error_item *item, error_exe_type errtype, const QString &MsgDesc, const QString &MsgTitle, time_t ltime){ qDebug() << (int) (item - &(srvdatas->err_log.values[0])) << "ERROR Fired!"; if(m_pLastErrItem == item ){ @@ -542,15 +542,15 @@ void OvenStatics::processErrorItems(error_item *item, error_exe_type errtype, co } -realtime_data OvenStatics::getPartsRealtimeData(void){ +realtime_data OvenStatistics::getPartsRealtimeData(void){ return realdata; } -uint8_t OvenStatics::getSensorTypeByIdx(uint16_t idx){ +uint8_t OvenStatistics::getSensorTypeByIdx(uint16_t idx){ if(idx > MAX_LOG_SENSOR) return 0; return sensorTypeInfo[idx]; } -type_temp OvenStatics::getCurSensorValueByIdx(uint16_t idx){ +type_temp OvenStatistics::getCurSensorValueByIdx(uint16_t idx){ return curSensorValue[idx]; } diff --git a/app/gui/oven_control/ovenstatics.h b/app/gui/oven_control/ovenstatics.h index db80d78..a29314a 100644 --- a/app/gui/oven_control/ovenstatics.h +++ b/app/gui/oven_control/ovenstatics.h @@ -160,13 +160,13 @@ typedef union }b; }realtime_data; -class OvenStatics : public QObject +class OvenStatistics : public QObject { Q_OBJECT public: servicedatas* srvdatas; - static OvenStatics* getInstance(QObject* parent = 0,UdpHandler * udp=0, Oven* oven=0); + static OvenStatistics* getInstance(QObject* parent = 0,UdpHandler * udp=0, Oven* oven=0); static void destroy(); bool getNeedErrorClear(); void clearNeedErrorClear(); @@ -213,7 +213,7 @@ private: type_temp curSensorValue[MAX_LOG_SENSOR]; - static OvenStatics* p_singtonInstance; + static OvenStatistics* p_singletonInstance; UdpHandler *udp; Oven* oven; oven_control_t control; @@ -229,8 +229,8 @@ private: bool bNeedErrorClear; bool bDataRefreshed; realtime_data realdata; - explicit OvenStatics(QObject* parent); - ~OvenStatics(); + explicit OvenStatistics(QObject* parent); + ~OvenStatistics(); void processSystemError(uint16_t errflag,time_t ltime); void processCommError(uint16_t errflag,time_t ltime); void processSensorError(uint16_t errflag, time_t ltime); diff --git a/app/gui/oven_control/realtimepartswindow.cpp b/app/gui/oven_control/realtimepartswindow.cpp index 16e3ad4..231abf0 100644 --- a/app/gui/oven_control/realtimepartswindow.cpp +++ b/app/gui/oven_control/realtimepartswindow.cpp @@ -57,7 +57,7 @@ void realtimePartsWindow::on_backButton_clicked() } void realtimePartsWindow::reloadUi(void){ - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); QString strTemp = ""; int i = 0,j=0; realtime_data realdata; diff --git a/app/gui/oven_control/realtimesensorwindow.cpp b/app/gui/oven_control/realtimesensorwindow.cpp index 87420fc..3ecfa70 100644 --- a/app/gui/oven_control/realtimesensorwindow.cpp +++ b/app/gui/oven_control/realtimesensorwindow.cpp @@ -6,7 +6,7 @@ realtimeSensorWindow::realtimeSensorWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::realtimeSensorWindow) { - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); int i = 0; ui->setupUi(this); @@ -74,7 +74,7 @@ void realtimeSensorWindow::reloadUi(void){ QString strTemp=""; struct tm *timeptr; int i = 0; - OvenStatics* ovs = OvenStatics::getInstance(); + OvenStatistics* ovs = OvenStatistics::getInstance(); if(ovs!= NULL){ for(i=0;i