From 52465a2dfa9959bbfe1031e09c4a2ec68ed70f75 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Wed, 24 May 2017 14:32:42 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B1=EB=9D=BC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EA=B0=90=EC=86=8C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Config 쪽으로 이동 --- app/gui/oven_control/config.cpp | 8 +++++++- app/gui/oven_control/config.h | 4 +++- app/gui/oven_control/main.cpp | 2 -- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp index 4177ca1..718b576 100644 --- a/app/gui/oven_control/config.cpp +++ b/app/gui/oven_control/config.cpp @@ -32,6 +32,10 @@ Config::Config(QObject *parent) : QObject(parent) memcpy(config_format,config_format_kr,MAX_CONFIG_COUNT*64); loadConfig(); loadFavorite(); + qApp->installEventFilter(&watcher); + applyConfig(); + + // m_setFavorite.insert(2); // m_setFavorite.insert(3); // m_setFavorite.insert(1); @@ -149,6 +153,9 @@ bool Config::loadConfig(){ return false; } +void Config::applyConfig(){ + watcher.setDelay(configlist.items.set_auto_darkness.d32); +} Define::config_item Config::getConfigValue(Define::ConfigType idx){ return configlist.values[idx]; @@ -325,7 +332,6 @@ QString Config::getTempString(int cel_temp){ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ QDialog *dlg; - bool bUsbDetect = false; QString usbPath = ""; switch(idx){ case config_language: diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index 8d06e6f..bcf00bd 100644 --- a/app/gui/oven_control/config.h +++ b/app/gui/oven_control/config.h @@ -4,6 +4,7 @@ #include #include +#include "inputoverwatcher.h" #define STRUCT_PACK __attribute__ ((packed)) @@ -257,7 +258,7 @@ class Config : public QObject ~Config(void); static Config *instance; - + InputOverwatcher watcher; @@ -388,6 +389,7 @@ public: //static void init(); void initConfig(void); bool loadConfig(void); + void applyConfig(void); bool saveConfig(void); Define::config_item getConfigValue(Define::ConfigType idx); void setConfigValue(Define::ConfigType idx, Define::config_item& itemdata); diff --git a/app/gui/oven_control/main.cpp b/app/gui/oven_control/main.cpp index 5ac3302..8d9f697 100644 --- a/app/gui/oven_control/main.cpp +++ b/app/gui/oven_control/main.cpp @@ -11,8 +11,6 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - InputOverwatcher watcher; - a.installEventFilter(&watcher); Oven *oven = Oven::getInstance(); -- 2.1.4