diff --git a/app/gui/oven_control/electricmodelsettingwindow.cpp b/app/gui/oven_control/electricmodelsettingwindow.cpp index 077b6f7..e45db38 100644 --- a/app/gui/oven_control/electricmodelsettingwindow.cpp +++ b/app/gui/oven_control/electricmodelsettingwindow.cpp @@ -16,24 +16,34 @@ ElectricModelSettingWindow::~ElectricModelSettingWindow() delete ui; } -void ElectricModelSettingWindow::on_e10Button_clicked() +void ElectricModelSettingWindow::setModel(Define::model_type model) { + Define::config_item item; + item.d32 = (int) model; + Config *config = Config::getInstance(); + config->setConfigValue(Define::config_model, item); + config->saveConfig(); } -void ElectricModelSettingWindow::on_e20Button_clicked() +void ElectricModelSettingWindow::on_e10Button_clicked() { + setModel(Define::model_electric_10); +} +void ElectricModelSettingWindow::on_e20Button_clicked() +{ + setModel(Define::model_electric_20); } void ElectricModelSettingWindow::on_e24Button_clicked() { - + setModel(Define::model_electric_24); } void ElectricModelSettingWindow::on_e40Button_clicked() { - + setModel(Define::model_electric_40); } void ElectricModelSettingWindow::on_backButton_clicked() diff --git a/app/gui/oven_control/electricmodelsettingwindow.h b/app/gui/oven_control/electricmodelsettingwindow.h index ad0b95b..9d35a44 100644 --- a/app/gui/oven_control/electricmodelsettingwindow.h +++ b/app/gui/oven_control/electricmodelsettingwindow.h @@ -3,6 +3,8 @@ #include +#include "config.h" + namespace Ui { class ElectricModelSettingWindow; } @@ -16,12 +18,11 @@ public: ~ElectricModelSettingWindow(); private slots: - void on_e10Button_clicked(); + void setModel(Define::model_type model); + void on_e10Button_clicked(); void on_e20Button_clicked(); - void on_e24Button_clicked(); - void on_e40Button_clicked(); void on_backButton_clicked(); diff --git a/app/gui/oven_control/gasmodelsettingwindow.cpp b/app/gui/oven_control/gasmodelsettingwindow.cpp index 36db203..ea7e4d3 100644 --- a/app/gui/oven_control/gasmodelsettingwindow.cpp +++ b/app/gui/oven_control/gasmodelsettingwindow.cpp @@ -16,44 +16,54 @@ GasModelSettingWindow::~GasModelSettingWindow() delete ui; } -void GasModelSettingWindow::on_lpg10Button_clicked() +void GasModelSettingWindow::setModel(Define::model_type model) { + Define::config_item item; + item.d32 = (int) model; + Config *config = Config::getInstance(); + config->setConfigValue(Define::config_model, item); + config->saveConfig(); } -void GasModelSettingWindow::on_lng10Button_clicked() +void GasModelSettingWindow::on_lpg10Button_clicked() { + setModel(Define::model_gas_lpg_10); +} +void GasModelSettingWindow::on_lng10Button_clicked() +{ + setModel(Define::model_gas_lng_10); } void GasModelSettingWindow::on_lpg20Button_clicked() { - + setModel(Define::model_gas_lpg_20); } void GasModelSettingWindow::on_lng20Button_clicked() { - + setModel(Define::model_gas_lng_20); } void GasModelSettingWindow::on_lpg24Button_clicked() { - + setModel(Define::model_gas_lpg_24); } void GasModelSettingWindow::on_lng24Button_clicked() { - + setModel(Define::model_gas_lng_24); } void GasModelSettingWindow::on_lpg40Button_clicked() { - + setModel(Define::model_gas_lpg_40); } void GasModelSettingWindow::on_lng40Button_clicked() { - + setModel(Define::model_gas_lng_40); } void GasModelSettingWindow::on_backButton_clicked() diff --git a/app/gui/oven_control/gasmodelsettingwindow.h b/app/gui/oven_control/gasmodelsettingwindow.h index 1db122d..512f3fe 100644 --- a/app/gui/oven_control/gasmodelsettingwindow.h +++ b/app/gui/oven_control/gasmodelsettingwindow.h @@ -3,6 +3,8 @@ #include +#include "config.h" + namespace Ui { class GasModelSettingWindow; } @@ -16,20 +18,14 @@ public: ~GasModelSettingWindow(); private slots: + void setModel(Define::model_type model); void on_lpg10Button_clicked(); - void on_lng10Button_clicked(); - void on_lpg20Button_clicked(); - void on_lng20Button_clicked(); - void on_lpg24Button_clicked(); - void on_lng24Button_clicked(); - void on_lpg40Button_clicked(); - void on_lng40Button_clicked(); void on_backButton_clicked();