에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 66338dd9aab3b5f5010ffcec1a862911d91a634d

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

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

 - 아이템 추가
 - 아이템 검색 변경
Showing 2 changed files with 44 additions and 23 deletions   Show diff stats
app/gui/oven_control/config.h
  Diff comments   View file @66338dd
... ... @@ -10,7 +10,7 @@
10 10  
11 11  
12 12 #define MAX_CONFIG_COUNT 46
13   -#define MAX_SOFTWARE_INFO_CNT 3
  13 +#define MAX_SOFTWARE_INFO_CNT 7
14 14 #define MAX_HOTLINE_CHEF_CNT 3
15 15 #define MAX_HOTLINE_SERVICE_CNT 2
16 16  
... ... @@ -80,10 +80,14 @@ const config_1digit_set load_ready_dlgset ={
80 80 10,
81 81 };
82 82  
83   -const char software_item_name[3][32] ={
  83 +const char software_item_name[MAX_SOFTWARE_INFO_CNT][32] ={
84 84 QT_TRANSLATE_NOOP("Config","모 델 명"),
85 85 QT_TRANSLATE_NOOP("Config","제조일자"),
86   - QT_TRANSLATE_NOOP("Config","소프트웨어 버전")
  86 + QT_TRANSLATE_NOOP("Config","제조국"),
  87 + QT_TRANSLATE_NOOP("Config","제조사"),
  88 + QT_TRANSLATE_NOOP("Config","제품번호"),
  89 + QT_TRANSLATE_NOOP("Config","소프트웨어 버전"),
  90 + QT_TRANSLATE_NOOP("Config","현재모델")
87 91 };
88 92  
89 93 const char hotline_chef_item_name[3][32] = {
... ...
app/gui/oven_control/configinfodlg.cpp
  Diff comments   View file @66338dd
... ... @@ -49,16 +49,29 @@ void ConfigInfoDlg::loadSoftwareInfo(){
49 49 QString strTemp;
50 50 QMap<QString , QString> mapInfos;
51 51 QLabel* label;
  52 +
  53 + QString itemname[] = {
  54 + "모델명",
  55 + "제조일자",
  56 + "제조국",
  57 + "제조사",
  58 + "제품번호",
  59 + "소프트웨어버전",
  60 + "현재모델"
  61 + };
  62 +
  63 +
52 64 mapInfos["모델명"] = "PRIME ST-01";
53 65 mapInfos["제조일자"] = "2017-06";
  66 + mapInfos["제조국"] = "한국";
  67 + mapInfos["제조사"] = "프라임";
  68 + mapInfos["제품번호"] = "01";
54 69 mapInfos["소프트웨어버전"] ="0.1 BETA";
  70 + mapInfos["현재모델"] = "한국";
  71 +
55 72  
56 73 for(int i =0;i<MAX_SOFTWARE_INFO_CNT;i++){
57   - strTemp.sprintf("%s",software_item_name[i]);
58   - qDebug() <<strTemp;
59   - strTemp = strTemp.replace(" ","");
60   - qDebug() << strTemp;
61   - strTemp = mapInfos[strTemp];
  74 + strTemp = mapInfos[itemname[i]];
62 75 label = new QLabel(this);
63 76 label ->setText(tr(software_item_name[i]).append(":"));
64 77 ui->gridLayout_info->addWidget(label,i,0);
... ... @@ -72,16 +85,19 @@ void ConfigInfoDlg::loadHotlineChefInfo(){
72 85 QString strTemp;
73 86 QMap<QString , QString> mapInfos;
74 87 QLabel* label;
75   - mapInfos["연락처"] = "010-3004-6517";
76   - mapInfos["이름"] = "김성우";
77   - mapInfos["위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
  88 +
  89 + QString itemname[] = {
  90 + "쉐프연락처",
  91 + "쉐프이름",
  92 + "쉐프위치정보"
  93 + };
  94 +
  95 + mapInfos["쉐프연락처"] = "010-3004-6517";
  96 + mapInfos["쉐프이름"] = "김성우";
  97 + mapInfos["쉐프위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
78 98  
79 99 for(int i =0;i<MAX_HOTLINE_CHEF_CNT;i++){
80   - strTemp.sprintf("%s",hotline_chef_item_name[i]);
81   - qDebug() <<strTemp;
82   - strTemp = strTemp.replace(" ","");
83   - qDebug() << strTemp;
84   - strTemp = mapInfos[strTemp];
  100 + strTemp = mapInfos[itemname[i]];
85 101 label = new QLabel(this);
86 102 label ->setText(tr(hotline_chef_item_name[i]).append(":"));
87 103 ui->gridLayout_info->addWidget(label,i,0);
... ... @@ -95,15 +111,16 @@ void ConfigInfoDlg::loadHotlineServiceInfo(){
95 111 QString strTemp;
96 112 QMap<QString , QString> mapInfos;
97 113 QLabel* label;
98   - mapInfos["연락처"] = "1644-9533";
99   - mapInfos["위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
  114 +
  115 + QString itemname[] = {
  116 + "서비스연락처",
  117 + "서비스위치정보"
  118 + };
  119 + mapInfos["서비스연락처"] = "1644-9533";
  120 + mapInfos["서비스위치정보"] ="인천광역시 남동구 남동동로 34번길 56";
100 121  
101 122 for(int i =0;i<MAX_HOTLINE_SERVICE_CNT;i++){
102   - strTemp.sprintf("%s",hotline_service_item_name[i]);
103   - qDebug() <<strTemp;
104   - strTemp = strTemp.replace(" ","");
105   - qDebug() << strTemp;
106   - strTemp = mapInfos[strTemp];
  123 + strTemp = mapInfos[itemname[i]];
107 124 label = new QLabel(this);
108 125 label ->setText(tr(hotline_service_item_name[i]).append(":"));
109 126 ui->gridLayout_info->addWidget(label,i,0);
... ...