From 1c53b45b79371b9f0c4eaefa29c260474146e170 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Fri, 4 Aug 2017 11:27:14 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=A8=20?= =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 업로드 파일 및 폴더 목록 수정 --- app/gui/oven_control/fileprocessdlg.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/app/gui/oven_control/fileprocessdlg.cpp b/app/gui/oven_control/fileprocessdlg.cpp index 46c0168..e9cf108 100644 --- a/app/gui/oven_control/fileprocessdlg.cpp +++ b/app/gui/oven_control/fileprocessdlg.cpp @@ -585,16 +585,19 @@ void FileProcessDlg::programUpload(){ QString strSrcPath; if(FileProcessor::detectUSB(strSrcPath)){ - worker.addSrcFile(QString("%1/prime/falinux/run.sh,/falinux").arg(strSrcPath)); - worker.addSrcFile(QString("%1/prime/falinux/app-prime-modbus,/falinux").arg(strSrcPath)); - worker.addSrcFile(QString("%1/prime/falinux/app-prime-gui,/falinux").arg(strSrcPath)); - worker.addSrcFile(QString("%1/prime/falinux/service-web,/falinux").arg(strSrcPath)); - worker.addSrcFile(QString("%1/prime/falinux/templates/main.tmpl,/falinux/templates").arg(strSrcPath)); - worker.addSrcFile(QString("%1/prime/falinux/system.ini,/falinux").arg(strSrcPath)); - //worker.addSrcFile(QString("%1/prime/falinux/superdaemon,/falinux").arg(strSrcPath)); - //worker.addSrcFile(QString("%1/prime/falinux/superdaemon.ini,/falinux").arg(strSrcPath)); - worker.setDestPath("/prime"); + worker.addSrcFile(QString("%1/prime/superdaemon,/prime").arg(strSrcPath)); + 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/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)); + worker.addSrcFile(QString("%1/prime/superdaemon.md5,/prime").arg(strSrcPath)); + worker.setDestPath("/prime"); worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/cookbook")); + worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/templates")); + worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/sounds")); worker.moveToThread(&programCopyThd); connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain())); @@ -721,9 +724,11 @@ void FileProcessDlg::standardInfoUpload() QString strUsbPath; QString strSrcPath; if(FileProcessor::detectUSB(strUsbPath)){ - strSrcPath = QString("%1/%2").arg(strUsbPath).arg(MODEL_INFO_FILE_NAME); + strSrcPath = QString("%1%2").arg(strUsbPath).arg(MODEL_INFO_FILE_NAME); + qDebug() <ctrWjProcess->setValue(40); @@ -737,7 +742,8 @@ void FileProcessDlg::standardInfoUpload() //QThread::msleep(800); file.setFileName(CHEF_INFO_FILE_NAME); file.remove(); - strSrcPath = QString("%1/%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME); + sync(); + strSrcPath = QString("%1%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME); qDebug() << strSrcPath; if(QFile::copy( strSrcPath ,CHEF_INFO_FILE_NAME)){ sync(); @@ -752,7 +758,8 @@ void FileProcessDlg::standardInfoUpload() //QThread::msleep(800); file.setFileName(SERVICE_INFO_FILE_NAME); file.remove(); - strSrcPath = QString("%1/%2").arg(strUsbPath).arg(SERVICE_INFO_FILE_NAME); + sync(); + strSrcPath = QString("%1%2").arg(strUsbPath).arg(SERVICE_INFO_FILE_NAME); qDebug() << strSrcPath; if(QFile::copy( strSrcPath ,SERVICE_INFO_FILE_NAME)){ sync(); -- 2.1.4