오븐 정보 다이얼로그 수정

- 버전 정보 출력 기능 수정 : define.h 사용

오븐 정보 다이얼로그 수정
- 버전 정보 출력 기능 수정 : define.h 사용
고영탁
1 parent 982cac1614
Showing 5 changed files with 23 additions and 8 deletions Show diff stats
app/gui/oven_control/configinfodlg.cpp
app/gui/oven_control/configinfodlg.h
app/gui/oven_control/define.h
app/gui/oven_control/lang_en.qm
app/gui/oven_control/lang_en.ts
@@ -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&lt;QString, QString&gt; &amp;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<QString>  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&lt;QString, QString&gt; &amp;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;i<MAX_SOFTWARE_INFO_CNT;i++){
         strTemp = mapInfos[tr(software_item_name[i])];
+
         label = new QLabel(this);
         label ->setText(tr(software_item_name[i]).append(" :"));
         ui->gridLayout_info->addWidget(label,i,0);
@@ -32,6 +32,7 @@ protected:
     void keyPressEvent(QKeyEvent* event);
     bool readFromInfoFile(QMap<QString , QString> &info_map, const QString &filename);
+    QString getSoftwareVerString(void);
 private:
     Ui::ConfigInfoDlg *ui;
@@ -3,6 +3,10 @@
 #include <QtCore>
+#define MAJOR_VER  0
+#define MINOR_VER   3
+#define HOTFIX_VER  11
+
 namespace Define
 {
     enum CookType
@@ -457,7 +457,7 @@ to factory setting values?&lt;/translation&gt;
     <message>
         <location filename="config.h" line="95"/>
         <source>제조일자</source>
-        <translation>Date of Manufacturing </translation>
+        <translation>Date of Manufacturing</translation>
     </message>
     <message>
         <location filename="config.h" line="96"/>
@@ -1066,9 +1066,7 @@ Value&lt;/translation&gt;
     <message>
         <location filename="configinfodlg.ui" line="144"/>
         <source>확인</source>
-        <translation>Confirm
-
-Confirm</translation>
+        <translation>Confirm</translation>
     </message>
     <message>
         <location filename="configinfodlg.cpp" line="12"/>
@@ -1138,7 +1136,7 @@ Confirm&lt;/translation&gt;
     <message>
         <location filename="configinfodlg.cpp" line="101"/>
         <source>제조일자</source>
-        <translation>Date of Manufacturing </translation>
+        <translation>Date of Manufacturing</translation>
     </message>
     <message>
         <location filename="configinfodlg.cpp" line="102"/>
	@@ -32,6 +32,7 @@ protected:		@@ -32,6 +32,7 @@ protected:
32	void keyPressEvent(QKeyEvent* event);	32	void keyPressEvent(QKeyEvent* event);
33		33
34	bool readFromInfoFile(QMap<QString , QString> &info_map, const QString &filename);	34	bool readFromInfoFile(QMap<QString , QString> &info_map, const QString &filename);
		35	+ QString getSoftwareVerString(void);
35		36
36	private:	37	private:
37	Ui::ConfigInfoDlg *ui;	38	Ui::ConfigInfoDlg *ui;