diff --git a/app/gui/oven_control/configinfodlg.cpp b/app/gui/oven_control/configinfodlg.cpp index 729a132..8cfd183 100644 --- a/app/gui/oven_control/configinfodlg.cpp +++ b/app/gui/oven_control/configinfodlg.cpp @@ -5,6 +5,7 @@ #include "ui_configinfodlg.h" #include "soundplayer.h" #include "config.h" +#include "define.h" @@ -74,11 +75,15 @@ bool ConfigInfoDlg::readFromInfoFile(QMap &info_map, const QSt qDebug() << "orgin size " << info_map.size(); if(file.open(QIODevice::ReadOnly | QIODevice::Text)){ while(!file.atEnd()){ - QString line = QString::fromUtf8(file.readLine()); + QString line = (QString::fromUtf8(file.readLine())).remove(QChar('\n')); info_map[line.section(',',0,0)] = line.section(',',1,1); } qDebug() << file.fileName() << "read OK!"; qDebug() << "final size " << info_map.size(); + QList list = info_map.keys(); + for(int i=0; i< info_map.size() ;i++){ + qDebug() << list[i] << info_map[list[i]]; + } return true; } else { @@ -87,6 +92,13 @@ bool ConfigInfoDlg::readFromInfoFile(QMap &info_map, const QSt return false; } +QString ConfigInfoDlg::getSoftwareVerString() +{ + if(MAJOR_VER == 0) + return QString("V%1.%2.%3 BETA").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER); + else return QString("V%1.%2.%3").arg(MAJOR_VER).arg(MINOR_VER).arg(HOTFIX_VER); +} + void ConfigInfoDlg::loadSoftwareInfo(){ Config* cfg = Config::getInstance(); @@ -102,14 +114,14 @@ void ConfigInfoDlg::loadSoftwareInfo(){ mapInfos[tr("제조국")] = "Korea"; mapInfos[tr("제조사")] = "프라임"; mapInfos[tr("제품번호")] = "01"; - mapInfos[tr("소프트웨어 버전")] ="0.1 BETA"; - + mapInfos[tr("소프트웨어 버전")] = getSoftwareVerString(); mapInfos[tr("현재모델")] = tr(g_strModelTypeName[cfg->getConfigValue(Define::config_model).d32]); readFromInfoFile(mapInfos, QString(MODEL_INFO_FILE_NAME)); for(int i =0;isetText(tr(software_item_name[i]).append(" :")); ui->gridLayout_info->addWidget(label,i,0); diff --git a/app/gui/oven_control/configinfodlg.h b/app/gui/oven_control/configinfodlg.h index 7a9ac41..ebb9aaf 100644 --- a/app/gui/oven_control/configinfodlg.h +++ b/app/gui/oven_control/configinfodlg.h @@ -32,6 +32,7 @@ protected: void keyPressEvent(QKeyEvent* event); bool readFromInfoFile(QMap &info_map, const QString &filename); + QString getSoftwareVerString(void); private: Ui::ConfigInfoDlg *ui; diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index ec7de77..39353c1 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -3,6 +3,10 @@ #include +#define MAJOR_VER 0 +#define MINOR_VER 3 +#define HOTFIX_VER 11 + namespace Define { enum CookType diff --git a/app/gui/oven_control/lang_en.qm b/app/gui/oven_control/lang_en.qm index a1a0f8a50d657419f6738d195b463ae2ca284671..b1c9413cf7d7f6cc5f80f2b51dd24df8e4df13e4 100644 GIT binary patch delta 6229 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 XlHb|Ek|kZ)!RaNA?4b`!lDGXIhAnNz delta 6238 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 diff --git a/app/gui/oven_control/lang_en.ts b/app/gui/oven_control/lang_en.ts index 3e25236..9042d46 100644 --- a/app/gui/oven_control/lang_en.ts +++ b/app/gui/oven_control/lang_en.ts @@ -457,7 +457,7 @@ to factory setting values? 제조일자 - Date of Manufacturing + Date of Manufacturing @@ -1066,9 +1066,7 @@ Value 확인 - Confirm - -Confirm + Confirm @@ -1138,7 +1136,7 @@ Confirm 제조일자 - Date of Manufacturing + Date of Manufacturing