에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 6d1d3987fe0421b4bd31f3ab09e5da15097d6ae7

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

GUI V1.0.9 

 - 테스트 윈도우 기능 추가
 - 프로그램 업로드시 파일 목록 복사 실패시에도 디렉토리 복사하는 버그 수정
 - service-web app 프로그램 업로드 목록에서 삭제
 - haccp.cpp 버그 라인 삭제
Showing 6 changed files with 61 additions and 8 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.cpp
  Diff comments   View file @6d1d398
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 #include "yesnopopupdlg.h" 4 #include "yesnopopupdlg.h"
5 #include "soundplayer.h" 5 #include "soundplayer.h"
6 #include "notipopupdlg.h" 6 #include "notipopupdlg.h"
  7 +#include "touchtestwindow.h"
7 8
8 AdjustmentWindow::AdjustmentWindow(QWidget *parent) : 9 AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
9 QMainWindow(parent), 10 QMainWindow(parent),
@@ -136,3 +137,11 @@ void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){ @@ -136,3 +137,11 @@ void AdjustmentWindow::keyReleaseEvent(QKeyEvent *event){
136 break; 137 break;
137 } 138 }
138 } 139 }
  140 +
  141 +void AdjustmentWindow::on_btnAdjust_LCD_clicked()
  142 +{
  143 + TouchTestWindow* wnd = new TouchTestWindow(this);
  144 + wnd->setWindowModality(Qt::WindowModal);
  145 + wnd->show();
  146 + wnd->raise();
  147 +}
app/gui/oven_control/adjustmentwindow.h
  Diff comments   View file @6d1d398
@@ -27,6 +27,8 @@ private slots: @@ -27,6 +27,8 @@ private slots:
27 27
28 void testTimerFired(void); 28 void testTimerFired(void);
29 29
  30 + void on_btnAdjust_LCD_clicked();
  31 +
30 protected: 32 protected:
31 void keyReleaseEvent(QKeyEvent* event); 33 void keyReleaseEvent(QKeyEvent* event);
32 void keyPressEvent(QKeyEvent* event); 34 void keyPressEvent(QKeyEvent* event);
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @6d1d398
@@ -266,14 +266,56 @@ QPushButton { @@ -266,14 +266,56 @@ QPushButton {
266 <x>100</x> 266 <x>100</x>
267 <y>606</y> 267 <y>606</y>
268 <width>28</width> 268 <width>28</width>
269 - <height>61</height> 269 + <height>151</height>
270 </rect> 270 </rect>
271 </property> 271 </property>
272 <property name="text"> 272 <property name="text">
273 <string/> 273 <string/>
274 </property> 274 </property>
275 <property name="pixmap"> 275 <property name="pixmap">
276 - <pixmap resource="resources.qrc">:/images/config/service/adjustment_line.png</pixmap> 276 + <pixmap resource="resources.qrc">:/images/config/service/realtime_menu_line.png</pixmap>
  277 + </property>
  278 + </widget>
  279 + <widget class="QPushButton" name="btnAdjust_LCD">
  280 + <property name="geometry">
  281 + <rect>
  282 + <x>124</x>
  283 + <y>718</y>
  284 + <width>379</width>
  285 + <height>70</height>
  286 + </rect>
  287 + </property>
  288 + <property name="sizePolicy">
  289 + <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
  290 + <horstretch>0</horstretch>
  291 + <verstretch>0</verstretch>
  292 + </sizepolicy>
  293 + </property>
  294 + <property name="font">
  295 + <font>
  296 + <family>Roboto</family>
  297 + <pointsize>10</pointsize>
  298 + <weight>75</weight>
  299 + <bold>true</bold>
  300 + <underline>false</underline>
  301 + </font>
  302 + </property>
  303 + <property name="styleSheet">
  304 + <string notr="true">QPushButton { border-image: url(:/images/config/service/089_set_window_all.png); }
  305 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/config/service/089_set_window_all_ov.png); }
  306 +QPushButton {
  307 + text-align: right;
  308 + padding-right : 20px;
  309 +}</string>
  310 + </property>
  311 + <property name="text">
  312 + <string notr="true">LCD</string>
  313 + </property>
  314 + <property name="iconSize">
  315 + <size>
  316 + <width>32</width>
  317 + <height>32</height>
  318 + </size>
277 </property> 319 </property>
278 </widget> 320 </widget>
279 <zorder>label</zorder> 321 <zorder>label</zorder>
@@ -282,6 +324,7 @@ QPushButton { @@ -282,6 +324,7 @@ QPushButton {
282 <zorder>bottomBar</zorder> 324 <zorder>bottomBar</zorder>
283 <zorder>gridLayoutWidget</zorder> 325 <zorder>gridLayoutWidget</zorder>
284 <zorder>btnAdjust</zorder> 326 <zorder>btnAdjust</zorder>
  327 + <zorder>btnAdjust_LCD</zorder>
285 </widget> 328 </widget>
286 </widget> 329 </widget>
287 <customwidgets> 330 <customwidgets>
app/gui/oven_control/define.h
  Diff comments   View file @6d1d398
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 0 7 #define MINOR_VER 0
8 -#define HOTFIX_VER 8 8 +#define HOTFIX_VER 9
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
app/gui/oven_control/fileprocessdlg.cpp
  Diff comments   View file @6d1d398
@@ -101,7 +101,7 @@ void ProgramCopyWorker::workerMain(){ @@ -101,7 +101,7 @@ void ProgramCopyWorker::workerMain(){
101 101
102 qDebug() << "File List Copy Finished"; 102 qDebug() << "File List Copy Finished";
103 103
104 - if(QThread::currentThread()->isInterruptionRequested() == false || bRst == false){ 104 + if(QThread::currentThread()->isInterruptionRequested() == false && bRst == true){
105 foreach(QString srcpath, m_arrSrcDirList){ 105 foreach(QString srcpath, m_arrSrcDirList){
106 qDebug() << "src dir : " << srcpath; 106 qDebug() << "src dir : " << srcpath;
107 107
@@ -156,11 +156,11 @@ void ProgramCopyWorker::workerMain(){ @@ -156,11 +156,11 @@ void ProgramCopyWorker::workerMain(){
156 if(QThread::currentThread()->isInterruptionRequested() || bRst == false) break; 156 if(QThread::currentThread()->isInterruptionRequested() || bRst == false) break;
157 } 157 }
158 strdirlist.clear(); 158 strdirlist.clear();
159 - if(QThread::currentThread()->isInterruptionRequested()) break; 159 + if(QThread::currentThread()->isInterruptionRequested() || bRst==false) break;
160 } 160 }
161 } 161 }
162 qDebug() << "File Copy Complete! SRC File Size = " << nTotalFileSize << "DEST File Size = " << nCpyFileSize; 162 qDebug() << "File Copy Complete! SRC File Size = " << nTotalFileSize << "DEST File Size = " << nCpyFileSize;
163 - 163 + sync();
164 if(QThread::currentThread()->isInterruptionRequested() || bRst == false){ 164 if(QThread::currentThread()->isInterruptionRequested() || bRst == false){
165 foreach(QString strinfo, m_arrSrcFileList){ 165 foreach(QString strinfo, m_arrSrcFileList){
166 QString filepath = strinfo.left(strinfo.indexOf(',',0)+1); 166 QString filepath = strinfo.left(strinfo.indexOf(',',0)+1);
@@ -690,7 +690,7 @@ void FileProcessDlg::programUpload(){ @@ -690,7 +690,7 @@ void FileProcessDlg::programUpload(){
690 worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath)); 690 worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath));
691 worker.addSrcFile(QString("%1/prime/app-prime-gui,/prime").arg(strSrcPath)); 691 worker.addSrcFile(QString("%1/prime/app-prime-gui,/prime").arg(strSrcPath));
692 worker.addSrcFile(QString("%1/prime/app-prime-modbus,/prime").arg(strSrcPath)); 692 worker.addSrcFile(QString("%1/prime/app-prime-modbus,/prime").arg(strSrcPath));
693 - worker.addSrcFile(QString("%1/prime/service-web,/prime").arg(strSrcPath)); 693 + //worker.addSrcFile(QString("%1/prime/service-web,/prime").arg(strSrcPath)); //Release 버전 삭제
694 worker.addSrcFile(QString("%1/prime/app-prime-gui.md5,/prime").arg(strSrcPath)); 694 worker.addSrcFile(QString("%1/prime/app-prime-gui.md5,/prime").arg(strSrcPath));
695 worker.addSrcFile(QString("%1/prime/app-prime-modbus.md5,/prime").arg(strSrcPath)); 695 worker.addSrcFile(QString("%1/prime/app-prime-modbus.md5,/prime").arg(strSrcPath));
696 worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath)); 696 worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath));
app/gui/oven_control/haccp.cpp
  Diff comments   View file @6d1d398
@@ -566,7 +566,6 @@ void saveData() @@ -566,7 +566,6 @@ void saveData()
566 file.close(); 566 file.close();
567 sync(); 567 sync();
568 568
569 - initializedTime = QDateTime();  
570 processCount++; 569 processCount++;
571 570
572 data.type = Invalid; 571 data.type = Invalid;