제품유형/소프트웨어에 관한 정보 변경

- 아이템 추가 - 아이템 검색 변경

제품유형/소프트웨어에 관한 정보 변경
- 아이템 추가 - 아이템 검색 변경
고영탁
1 parent 79daa72096
Showing 2 changed files with 44 additions and 23 deletions Show diff stats
app/gui/oven_control/config.h
app/gui/oven_control/configinfodlg.cpp
@@ -10,7 +10,7 @@
 #define MAX_CONFIG_COUNT 46
-#define MAX_SOFTWARE_INFO_CNT   3
+#define MAX_SOFTWARE_INFO_CNT   7
 #define MAX_HOTLINE_CHEF_CNT    3
 #define MAX_HOTLINE_SERVICE_CNT 2
@@ -80,10 +80,14 @@ const config_1digit_set load_ready_dlgset ={
     10,
 };
-const char software_item_name[3][32] ={
+const char software_item_name[MAX_SOFTWARE_INFO_CNT][32] ={
     QT_TRANSLATE_NOOP("Config","모  델  명"),
     QT_TRANSLATE_NOOP("Config","제조일자"),
-    QT_TRANSLATE_NOOP("Config","소프트웨어 버전")
+    QT_TRANSLATE_NOOP("Config","제조국"),
+    QT_TRANSLATE_NOOP("Config","제조사"),
+    QT_TRANSLATE_NOOP("Config","제품번호"),
+    QT_TRANSLATE_NOOP("Config","소프트웨어 버전"),
+    QT_TRANSLATE_NOOP("Config","현재모델")
 };
 const char hotline_chef_item_name[3][32] = {
@@ -49,16 +49,29 @@ void ConfigInfoDlg::loadSoftwareInfo(){
     QString strTemp;
     QMap<QString , QString> mapInfos;
     QLabel* label;
+
+    QString itemname[] = {
+        "모델명",
+        "제조일자",
+        "제조국",
+        "제조사",
+        "제품번호",
+        "소프트웨어버전",
+        "현재모델"
+    };
+
+
     mapInfos["모델명"] = "PRIME ST-01";
     mapInfos["제조일자"] = "2017-06";
+    mapInfos["제조국"] = "한국";
+    mapInfos["제조사"] = "프라임";
+    mapInfos["제품번호"] = "01";
     mapInfos["소프트웨어버전"] ="0.1 BETA";
+    mapInfos["현재모델"] = "한국";
+
     for(int i =0;i<MAX_SOFTWARE_INFO_CNT;i++){
-        strTemp.sprintf("%s",software_item_name[i]);
-        qDebug() <<strTemp;
-        strTemp = strTemp.replace(" ","");
-        qDebug() << strTemp;
-        strTemp = mapInfos[strTemp];
+        strTemp = mapInfos[itemname[i]];
         label = new QLabel(this);
         label ->setText(tr(software_item_name[i]).append(":"));
         ui->gridLayout_info->addWidget(label,i,0);
@@ -72,16 +85,19 @@ void ConfigInfoDlg::loadHotlineChefInfo(){
     QString strTemp;
     QMap<QString , QString> mapInfos;
     QLabel* label;
-    mapInfos["연락처"] = "010-3004-6517";
-    mapInfos["이름"] = "김성우";
-    mapInfos["위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
+
+    QString itemname[] = {
+        "쉐프연락처",
+        "쉐프이름",
+        "쉐프위치정보"
+    };
+
+    mapInfos["쉐프연락처"] = "010-3004-6517";
+    mapInfos["쉐프이름"] = "김성우";
+    mapInfos["쉐프위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
     for(int i =0;i<MAX_HOTLINE_CHEF_CNT;i++){
-        strTemp.sprintf("%s",hotline_chef_item_name[i]);
-        qDebug() <<strTemp;
-        strTemp = strTemp.replace(" ","");
-        qDebug() << strTemp;
-        strTemp = mapInfos[strTemp];
+        strTemp = mapInfos[itemname[i]];
         label = new QLabel(this);
         label ->setText(tr(hotline_chef_item_name[i]).append(":"));
         ui->gridLayout_info->addWidget(label,i,0);
@@ -95,15 +111,16 @@ void ConfigInfoDlg::loadHotlineServiceInfo(){
     QString strTemp;
     QMap<QString , QString> mapInfos;
     QLabel* label;
-    mapInfos["연락처"] = "1644-9533";
-    mapInfos["위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
+
+    QString itemname[] = {
+        "서비스연락처",
+        "서비스위치정보"
+    };
+    mapInfos["서비스연락처"] = "1644-9533";
+    mapInfos["서비스위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
     for(int i =0;i<MAX_HOTLINE_SERVICE_CNT;i++){
-        strTemp.sprintf("%s",hotline_service_item_name[i]);
-        qDebug() <<strTemp;
-        strTemp = strTemp.replace(" ","");
-        qDebug() << strTemp;
-        strTemp = mapInfos[strTemp];
+        strTemp = mapInfos[itemname[i]];
         label = new QLabel(this);
         label ->setText(tr(hotline_service_item_name[i]).append(":"));
         ui->gridLayout_info->addWidget(label,i,0);