에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit f677b91ccd04faef6da4f6ff8f096f5b5600ce92

Authored by 김태훈
2 parents 3235df3c05 1c53b45b79
Exists in master and in 2 other branches fhd, fhd-demo

Merge branch 'master' of 192.168.10.12:falinux/1611_0007_prime_oven

Showing 1 changed file   Show diff stats
app/gui/oven_control/fileprocessdlg.cpp
  Diff comments   View file @f677b91
@@ -585,16 +585,19 @@ void FileProcessDlg::programUpload(){ @@ -585,16 +585,19 @@ void FileProcessDlg::programUpload(){
585 QString strSrcPath; 585 QString strSrcPath;
586 586
587 if(FileProcessor::detectUSB(strSrcPath)){ 587 if(FileProcessor::detectUSB(strSrcPath)){
588 - worker.addSrcFile(QString("%1/prime/falinux/run.sh,/falinux").arg(strSrcPath));  
589 - worker.addSrcFile(QString("%1/prime/falinux/app-prime-modbus,/falinux").arg(strSrcPath));  
590 - worker.addSrcFile(QString("%1/prime/falinux/app-prime-gui,/falinux").arg(strSrcPath));  
591 - worker.addSrcFile(QString("%1/prime/falinux/service-web,/falinux").arg(strSrcPath));  
592 - worker.addSrcFile(QString("%1/prime/falinux/templates/main.tmpl,/falinux/templates").arg(strSrcPath));  
593 - worker.addSrcFile(QString("%1/prime/falinux/system.ini,/falinux").arg(strSrcPath));  
594 - //worker.addSrcFile(QString("%1/prime/falinux/superdaemon,/falinux").arg(strSrcPath));  
595 - //worker.addSrcFile(QString("%1/prime/falinux/superdaemon.ini,/falinux").arg(strSrcPath));  
596 - worker.setDestPath("/prime"); 588 + worker.addSrcFile(QString("%1/prime/superdaemon,/prime").arg(strSrcPath));
  589 + worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath));
  590 + worker.addSrcFile(QString("%1/prime/app-prime-gui,/prime").arg(strSrcPath));
  591 + worker.addSrcFile(QString("%1/prime/app-prime-modbus,/prime").arg(strSrcPath));
  592 + worker.addSrcFile(QString("%1/prime/service-web,/prime").arg(strSrcPath));
  593 + worker.addSrcFile(QString("%1/prime/app-prime-gui.md5,/prime").arg(strSrcPath));
  594 + worker.addSrcFile(QString("%1/prime/app-prime-modbus.md5,/prime").arg(strSrcPath));
  595 + worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath));
  596 + worker.addSrcFile(QString("%1/prime/superdaemon.md5,/prime").arg(strSrcPath));
  597 + worker.setDestPath("/prime");
597 worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/cookbook")); 598 worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/cookbook"));
  599 + worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/templates"));
  600 + worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/sounds"));
598 worker.moveToThread(&programCopyThd); 601 worker.moveToThread(&programCopyThd);
599 602
600 connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain())); 603 connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain()));
@@ -721,9 +724,11 @@ void FileProcessDlg::standardInfoUpload() @@ -721,9 +724,11 @@ void FileProcessDlg::standardInfoUpload()
721 QString strUsbPath; 724 QString strUsbPath;
722 QString strSrcPath; 725 QString strSrcPath;
723 if(FileProcessor::detectUSB(strUsbPath)){ 726 if(FileProcessor::detectUSB(strUsbPath)){
724 - strSrcPath = QString("%1/%2").arg(strUsbPath).arg(MODEL_INFO_FILE_NAME); 727 + strSrcPath = QString("%1%2").arg(strUsbPath).arg(MODEL_INFO_FILE_NAME);
  728 + qDebug() <<strSrcPath;
725 QFile file(MODEL_INFO_FILE_NAME); 729 QFile file(MODEL_INFO_FILE_NAME);
726 file.remove(); 730 file.remove();
  731 + sync();
727 if(QFile::copy( strSrcPath ,MODEL_INFO_FILE_NAME)){ 732 if(QFile::copy( strSrcPath ,MODEL_INFO_FILE_NAME)){
728 sync(); 733 sync();
729 ui->ctrWjProcess->setValue(40); 734 ui->ctrWjProcess->setValue(40);
@@ -737,7 +742,8 @@ void FileProcessDlg::standardInfoUpload() @@ -737,7 +742,8 @@ void FileProcessDlg::standardInfoUpload()
737 //QThread::msleep(800); 742 //QThread::msleep(800);
738 file.setFileName(CHEF_INFO_FILE_NAME); 743 file.setFileName(CHEF_INFO_FILE_NAME);
739 file.remove(); 744 file.remove();
740 - strSrcPath = QString("%1/%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME); 745 + sync();
  746 + strSrcPath = QString("%1%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME);
741 qDebug() << strSrcPath; 747 qDebug() << strSrcPath;
742 if(QFile::copy( strSrcPath ,CHEF_INFO_FILE_NAME)){ 748 if(QFile::copy( strSrcPath ,CHEF_INFO_FILE_NAME)){
743 sync(); 749 sync();
@@ -752,7 +758,8 @@ void FileProcessDlg::standardInfoUpload() @@ -752,7 +758,8 @@ void FileProcessDlg::standardInfoUpload()
752 //QThread::msleep(800); 758 //QThread::msleep(800);
753 file.setFileName(SERVICE_INFO_FILE_NAME); 759 file.setFileName(SERVICE_INFO_FILE_NAME);
754 file.remove(); 760 file.remove();
755 - strSrcPath = QString("%1/%2").arg(strUsbPath).arg(SERVICE_INFO_FILE_NAME); 761 + sync();
  762 + strSrcPath = QString("%1%2").arg(strUsbPath).arg(SERVICE_INFO_FILE_NAME);
756 qDebug() << strSrcPath; 763 qDebug() << strSrcPath;
757 if(QFile::copy( strSrcPath ,SERVICE_INFO_FILE_NAME)){ 764 if(QFile::copy( strSrcPath ,SERVICE_INFO_FILE_NAME)){
758 sync(); 765 sync();