diff --git a/app/gui/oven_control/adjustmentwindow.cpp b/app/gui/oven_control/adjustmentwindow.cpp
index 46b15a7..afcbec3 100644
--- a/app/gui/oven_control/adjustmentwindow.cpp
+++ b/app/gui/oven_control/adjustmentwindow.cpp
@@ -4,6 +4,7 @@
#include "yesnopopupdlg.h"
#include "soundplayer.h"
#include "notipopupdlg.h"
+#include "touchtestwindow.h"
AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
QMainWindow(parent),
@@ -136,3 +137,11 @@ void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){
break;
}
}
+
+void AdjustmentWindow::on_btnAdjust_LCD_clicked()
+{
+ TouchTestWindow* wnd = new TouchTestWindow(this);
+ wnd->setWindowModality(Qt::WindowModal);
+ wnd->show();
+ wnd->raise();
+}
diff --git a/app/gui/oven_control/adjustmentwindow.h b/app/gui/oven_control/adjustmentwindow.h
index e7155bf..0c9bc19 100644
--- a/app/gui/oven_control/adjustmentwindow.h
+++ b/app/gui/oven_control/adjustmentwindow.h
@@ -27,6 +27,8 @@ private slots:
void testTimerFired(void);
+ void on_btnAdjust_LCD_clicked();
+
protected:
void keyReleaseEvent(QKeyEvent* event);
void keyPressEvent(QKeyEvent* event);
diff --git a/app/gui/oven_control/adjustmentwindow.ui b/app/gui/oven_control/adjustmentwindow.ui
index eb8ad69..59e939b 100644
--- a/app/gui/oven_control/adjustmentwindow.ui
+++ b/app/gui/oven_control/adjustmentwindow.ui
@@ -266,14 +266,56 @@ QPushButton {
100
606
28
- 61
+ 151
- :/images/config/service/adjustment_line.png
+ :/images/config/service/realtime_menu_line.png
+
+
+
+
+
+ 124
+ 718
+ 379
+ 70
+
+
+
+
+ 0
+ 0
+
+
+
+
+ Roboto
+ 10
+ 75
+ true
+ false
+
+
+
+ QPushButton { border-image: url(:/images/config/service/089_set_window_all.png); }
+QPushButton:pressed, QPushButton:focus { border-image: url(:/images/config/service/089_set_window_all_ov.png); }
+QPushButton {
+ text-align: right;
+ padding-right : 20px;
+}
+
+
+ LCD
+
+
+
+ 32
+ 32
+
label
@@ -282,6 +324,7 @@ QPushButton {
bottomBar
gridLayoutWidget
btnAdjust
+ btnAdjust_LCD
diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h
index a76cc7e..cf4f9c6 100644
--- a/app/gui/oven_control/define.h
+++ b/app/gui/oven_control/define.h
@@ -5,7 +5,7 @@
#define MAJOR_VER 1
#define MINOR_VER 0
-#define HOTFIX_VER 8
+#define HOTFIX_VER 9
// 0 for normal
// 1 for premium
diff --git a/app/gui/oven_control/fileprocessdlg.cpp b/app/gui/oven_control/fileprocessdlg.cpp
index c628e8f..5222dd6 100644
--- a/app/gui/oven_control/fileprocessdlg.cpp
+++ b/app/gui/oven_control/fileprocessdlg.cpp
@@ -101,7 +101,7 @@ void ProgramCopyWorker::workerMain(){
qDebug() << "File List Copy Finished";
- if(QThread::currentThread()->isInterruptionRequested() == false || bRst == false){
+ if(QThread::currentThread()->isInterruptionRequested() == false && bRst == true){
foreach(QString srcpath, m_arrSrcDirList){
qDebug() << "src dir : " << srcpath;
@@ -156,11 +156,11 @@ void ProgramCopyWorker::workerMain(){
if(QThread::currentThread()->isInterruptionRequested() || bRst == false) break;
}
strdirlist.clear();
- if(QThread::currentThread()->isInterruptionRequested()) break;
+ if(QThread::currentThread()->isInterruptionRequested() || bRst==false) break;
}
}
qDebug() << "File Copy Complete! SRC File Size = " << nTotalFileSize << "DEST File Size = " << nCpyFileSize;
-
+ sync();
if(QThread::currentThread()->isInterruptionRequested() || bRst == false){
foreach(QString strinfo, m_arrSrcFileList){
QString filepath = strinfo.left(strinfo.indexOf(',',0)+1);
@@ -690,7 +690,7 @@ void FileProcessDlg::programUpload(){
worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath));
worker.addSrcFile(QString("%1/prime/app-prime-gui,/prime").arg(strSrcPath));
worker.addSrcFile(QString("%1/prime/app-prime-modbus,/prime").arg(strSrcPath));
- worker.addSrcFile(QString("%1/prime/service-web,/prime").arg(strSrcPath));
+ //worker.addSrcFile(QString("%1/prime/service-web,/prime").arg(strSrcPath)); //Release 버전 삭제
worker.addSrcFile(QString("%1/prime/app-prime-gui.md5,/prime").arg(strSrcPath));
worker.addSrcFile(QString("%1/prime/app-prime-modbus.md5,/prime").arg(strSrcPath));
worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath));
diff --git a/app/gui/oven_control/haccp.cpp b/app/gui/oven_control/haccp.cpp
index 00d50db..71deb1f 100644
--- a/app/gui/oven_control/haccp.cpp
+++ b/app/gui/oven_control/haccp.cpp
@@ -566,7 +566,6 @@ void saveData()
file.close();
sync();
- initializedTime = QDateTime();
processCount++;
data.type = Invalid;