diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp index 3a5ec14..0b907eb 100644 --- a/app/gui/oven_control/config.cpp +++ b/app/gui/oven_control/config.cpp @@ -487,6 +487,8 @@ bool Config::loadProductInfo() QString strTemp; QMap mapInfos; + qDebug() << QString("START GUI V%1.%2.%3").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER); + FileProcessor::readFromInfoFile(mapInfos, QString(MODEL_INFO_FILE_NAME)); //m_strProductModelName = mapInfos[tr("모 델 명")]; diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index 579e5d9..4f088f0 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -5,11 +5,11 @@ #define MAJOR_VER 1 #define MINOR_VER 0 -#define HOTFIX_VER 10 +#define HOTFIX_VER 11 // 0 for normal // 1 for premium -#define MODEL_GRADE 0 +#define MODEL_GRADE 1 namespace Define { diff --git a/app/gui/oven_control/fileprocessdlg.cpp b/app/gui/oven_control/fileprocessdlg.cpp index 0e21b12..2609c3a 100644 --- a/app/gui/oven_control/fileprocessdlg.cpp +++ b/app/gui/oven_control/fileprocessdlg.cpp @@ -661,7 +661,6 @@ void FileProcessDlg::programDownload(){ void FileProcessDlg::onProgressFinished(){ QString strDescPath; QString strZipCmd; - m_bRst = true; QProcess process; FileProcessor::detectUSB(strDescPath); @@ -677,7 +676,7 @@ void FileProcessDlg::onProgressFinished(){ qDebug() << info.absoluteFilePath(); - if(m_nCfgtype == config_program_upload && m_bRst && info.exists()==true){ + if(m_nCfgtype == config_program_upload && info.exists()==true){ if(cookbooksrc.exists()){ if(cookBookback.exists()){ process.start("sh -c \"rm -r /prime/cookbook_back\""); @@ -716,9 +715,23 @@ void FileProcessDlg::onProgressFinished(){ process.start("sync"); process.waitForFinished(); qDebug() << QTime::currentTime(); - ui->ctrLbRemainTime->setText(tr("CookBook Upload Success!.")); + if(m_bRst){ + ui->ctrLbRemainTime->setText(tr("Program & CookBook Upload Success!.")); + }else{ + ui->ctrLbRemainTime->setText(tr("CookBook Upload Success!.")); + } QTimer::singleShot(2000,this, SLOT(close())); } + else if(m_nCfgtype == config_program_upload){ + if(m_bRst){ + ui->ctrLbRemainTime->setText(tr("Program Upload Success")); + QTimer::singleShot(2000,this, SLOT(close())); + } + else{ + ui->ctrLbRemainTime->setText(tr("Program Upload Fail")); + QTimer::singleShot(2000,this, SLOT(close())); + } + } else{ ui->ctrLbRemainTime->setText(tr("완료")); QTimer::singleShot(2000,this, SLOT(close())); @@ -728,7 +741,7 @@ void FileProcessDlg::onProgressFinished(){ void FileProcessDlg::onErrorFired(QString Desc) { m_bRst = false; - ui->ctrLbRemainTime->setText(QString("%1 %2").arg(Desc).arg(tr("에러 발생으로 종료합니다."))); + //ui->ctrLbRemainTime->setText(QString("%1 %2").arg(Desc).arg(tr("에러 발생으로 종료합니다."))); //QTimer::singleShot(1000,this, SLOT(close())); }