에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit df5e27b261328c4f14ebb7ce04e9a6ac2e7f56c1

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

GUI V1.0.11 

 - 시작시 버전 디버그 메시지 출력
 - 프로그램 업로드 시 메시지 출력 세분화
Showing 3 changed files with 21 additions and 6 deletions   Show diff stats
app/gui/oven_control/config.cpp
  Diff comments   View file @df5e27b
@@ -487,6 +487,8 @@ bool Config::loadProductInfo() @@ -487,6 +487,8 @@ bool Config::loadProductInfo()
487 QString strTemp; 487 QString strTemp;
488 QMap<QString , QString> mapInfos; 488 QMap<QString , QString> mapInfos;
489 489
  490 + qDebug() << QString("START GUI V%1.%2.%3").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER);
  491 +
490 FileProcessor::readFromInfoFile(mapInfos, QString(MODEL_INFO_FILE_NAME)); 492 FileProcessor::readFromInfoFile(mapInfos, QString(MODEL_INFO_FILE_NAME));
491 493
492 //m_strProductModelName = mapInfos[tr("모 델 명")]; 494 //m_strProductModelName = mapInfos[tr("모 델 명")];
app/gui/oven_control/define.h
  Diff comments   View file @df5e27b
@@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
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 10 8 +#define HOTFIX_VER 11
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
12 -#define MODEL_GRADE 0 12 +#define MODEL_GRADE 1
13 13
14 namespace Define 14 namespace Define
15 { 15 {
app/gui/oven_control/fileprocessdlg.cpp
  Diff comments   View file @df5e27b
@@ -661,7 +661,6 @@ void FileProcessDlg::programDownload(){ @@ -661,7 +661,6 @@ void FileProcessDlg::programDownload(){
661 void FileProcessDlg::onProgressFinished(){ 661 void FileProcessDlg::onProgressFinished(){
662 QString strDescPath; 662 QString strDescPath;
663 QString strZipCmd; 663 QString strZipCmd;
664 - m_bRst = true;  
665 QProcess process; 664 QProcess process;
666 665
667 FileProcessor::detectUSB(strDescPath); 666 FileProcessor::detectUSB(strDescPath);
@@ -677,7 +676,7 @@ void FileProcessDlg::onProgressFinished(){ @@ -677,7 +676,7 @@ void FileProcessDlg::onProgressFinished(){
677 676
678 qDebug() << info.absoluteFilePath(); 677 qDebug() << info.absoluteFilePath();
679 678
680 - if(m_nCfgtype == config_program_upload && m_bRst && info.exists()==true){ 679 + if(m_nCfgtype == config_program_upload && info.exists()==true){
681 if(cookbooksrc.exists()){ 680 if(cookbooksrc.exists()){
682 if(cookBookback.exists()){ 681 if(cookBookback.exists()){
683 process.start("sh -c \"rm -r /prime/cookbook_back\""); 682 process.start("sh -c \"rm -r /prime/cookbook_back\"");
@@ -716,9 +715,23 @@ void FileProcessDlg::onProgressFinished(){ @@ -716,9 +715,23 @@ void FileProcessDlg::onProgressFinished(){
716 process.start("sync"); 715 process.start("sync");
717 process.waitForFinished(); 716 process.waitForFinished();
718 qDebug() << QTime::currentTime(); 717 qDebug() << QTime::currentTime();
719 - ui->ctrLbRemainTime->setText(tr("CookBook Upload Success!.")); 718 + if(m_bRst){
  719 + ui->ctrLbRemainTime->setText(tr("Program & CookBook Upload Success!."));
  720 + }else{
  721 + ui->ctrLbRemainTime->setText(tr("CookBook Upload Success!."));
  722 + }
720 QTimer::singleShot(2000,this, SLOT(close())); 723 QTimer::singleShot(2000,this, SLOT(close()));
721 } 724 }
  725 + else if(m_nCfgtype == config_program_upload){
  726 + if(m_bRst){
  727 + ui->ctrLbRemainTime->setText(tr("Program Upload Success"));
  728 + QTimer::singleShot(2000,this, SLOT(close()));
  729 + }
  730 + else{
  731 + ui->ctrLbRemainTime->setText(tr("Program Upload Fail"));
  732 + QTimer::singleShot(2000,this, SLOT(close()));
  733 + }
  734 + }
722 else{ 735 else{
723 ui->ctrLbRemainTime->setText(tr("완료")); 736 ui->ctrLbRemainTime->setText(tr("완료"));
724 QTimer::singleShot(2000,this, SLOT(close())); 737 QTimer::singleShot(2000,this, SLOT(close()));
@@ -728,7 +741,7 @@ void FileProcessDlg::onProgressFinished(){ @@ -728,7 +741,7 @@ void FileProcessDlg::onProgressFinished(){
728 void FileProcessDlg::onErrorFired(QString Desc) 741 void FileProcessDlg::onErrorFired(QString Desc)
729 { 742 {
730 m_bRst = false; 743 m_bRst = false;
731 - ui->ctrLbRemainTime->setText(QString("%1 %2").arg(Desc).arg(tr("에러 발생으로 종료합니다."))); 744 + //ui->ctrLbRemainTime->setText(QString("%1 %2").arg(Desc).arg(tr("에러 발생으로 종료합니다.")));
732 //QTimer::singleShot(1000,this, SLOT(close())); 745 //QTimer::singleShot(1000,this, SLOT(close()));
733 } 746 }
734 747