From 3130d441689dbf72b1b41770ad89a77d45dd8f8e Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Tue, 30 May 2017 11:02:49 +0900
Subject: [PATCH] =?UTF-8?q?IP=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gui/oven_control/config.cpp      | 11 +++++++++
 app/gui/oven_control/configipdlg.cpp | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp
index 2fc9bbb..f28db96 100644
--- a/app/gui/oven_control/config.cpp
+++ b/app/gui/oven_control/config.cpp
@@ -21,8 +21,10 @@
 #include "fileprocessor.h"
 #include "backlight.h"
 #include "udphandler.h"
+#include "system.h"
 
 using namespace Define;
+using namespace System;
 
 #define CONFIG_FILE_NAME    "/prime/config/config.ini"
 #define FAVORITE_FILE_NAME "/prime/config/favorite.ini"
@@ -181,6 +183,15 @@ void Config::applyConfig(){
         }
         break;
     }
+
+    System::IPData ipdata;
+
+    ipdata.address = QString("%1.%2.%3.%4").arg(configlist.items.ip.d8.d8_0).arg(configlist.items.ip.d8.d8_1).arg(configlist.items.ip.d8.d8_2).arg(configlist.items.ip.d8.d8_3);
+    ipdata.gateway = QString("%1.%2.%3.%4").arg(configlist.items.gateway.d8.d8_0).arg(configlist.items.gateway.d8.d8_1).arg(configlist.items.gateway.d8.d8_2).arg(configlist.items.gateway.d8.d8_3);
+    ipdata.netmask = QString("%1.%2.%3.%4").arg(configlist.items.netmask.d8.d8_0).arg(configlist.items.netmask.d8.d8_1).arg(configlist.items.netmask.d8.d8_2).arg(configlist.items.netmask.d8.d8_3);
+
+    System::setIP(ipdata);
+
 }
 
 Define::config_item Config::getConfigValue(Define::ConfigType idx){
diff --git a/app/gui/oven_control/configipdlg.cpp b/app/gui/oven_control/configipdlg.cpp
index e587596..e74d4c1 100644
--- a/app/gui/oven_control/configipdlg.cpp
+++ b/app/gui/oven_control/configipdlg.cpp
@@ -1,5 +1,8 @@
 #include "configipdlg.h"
 #include "ui_configipdlg.h"
+#include "config.h"
+
+using namespace Define;
 
 ConfigIpDlg::ConfigIpDlg(QWidget *parent) :
     QDialog(parent),
@@ -21,6 +24,28 @@ ConfigIpDlg::ConfigIpDlg(QWidget *parent) :
     ui->ctrNetmask_1->setFormatterWidth(3);
     ui->ctrNetmask_2->setFormatterWidth(3);
     ui->ctrNetmask_3->setFormatterWidth(3);
+
+    Config* cfg = Config::getInstance();
+
+    config_item temp;
+    temp = cfg->getConfigValue(config_ip);
+    ui->ctrIp_0->setValue(temp.d8.d8_0);
+    ui->ctrIp_1->setValue(temp.d8.d8_1);
+    ui->ctrIp_2->setValue(temp.d8.d8_2);
+    ui->ctrIp_3->setValue(temp.d8.d8_3);
+
+    temp = cfg->getConfigValue(config_gateway);
+    ui->ctrGw_0->setValue(temp.d8.d8_0);
+    ui->ctrGw_1->setValue(temp.d8.d8_1);
+    ui->ctrGw_2->setValue(temp.d8.d8_2);
+    ui->ctrGw_3->setValue(temp.d8.d8_3);
+
+    temp = cfg->getConfigValue(config_netmask);
+    ui->ctrNetmask_0->setValue(temp.d8.d8_0);
+    ui->ctrNetmask_1->setValue(temp.d8.d8_1);
+    ui->ctrNetmask_2->setValue(temp.d8.d8_2);
+    ui->ctrNetmask_3->setValue(temp.d8.d8_3);
+
 }
 
 ConfigIpDlg::~ConfigIpDlg()
@@ -30,6 +55,27 @@ ConfigIpDlg::~ConfigIpDlg()
 
 void ConfigIpDlg::on_ctrBtnOk_clicked()
 {
+    Config* cfg = Config::getInstance();
+    config_item temp;
+
+    temp.d8.d8_0 = (uint8_t)ui->ctrIp_0->value();
+    temp.d8.d8_1 = (uint8_t)ui->ctrIp_1->value();
+    temp.d8.d8_2 = (uint8_t)ui->ctrIp_2->value();
+    temp.d8.d8_3 = (uint8_t)ui->ctrIp_3->value();
+    cfg->setConfigValue(config_ip, temp);
+
+    temp.d8.d8_0 = (uint8_t)ui->ctrGw_0->value();
+    temp.d8.d8_1 = (uint8_t)ui->ctrGw_1->value();
+    temp.d8.d8_2 = (uint8_t)ui->ctrGw_2->value();
+    temp.d8.d8_3 = (uint8_t)ui->ctrGw_3->value();
+    cfg->setConfigValue(config_gateway, temp);
+
+    temp.d8.d8_0 = (uint8_t)ui->ctrNetmask_0->value();
+    temp.d8.d8_1 = (uint8_t)ui->ctrNetmask_1->value();
+    temp.d8.d8_2 = (uint8_t)ui->ctrNetmask_2->value();
+    temp.d8.d8_3 = (uint8_t)ui->ctrNetmask_3->value();
+    cfg->setConfigValue(config_netmask, temp);
+
     accept();
 }
 
-- 
2.1.4