From 22f83e90f6ded256b43ef80c22d89b3ed06ea1ff Mon Sep 17 00:00:00 2001 From: victor Date: Thu, 18 May 2017 16:38:54 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=20=EC=84=A4=EC=A0=95=20UI=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oven_control/electricmodelsettingwindow.cpp | 42 ++ app/gui/oven_control/electricmodelsettingwindow.h | 33 ++ app/gui/oven_control/electricmodelsettingwindow.ui | 469 +++++++++++++++ app/gui/oven_control/engineermenuwindow.cpp | 9 + app/gui/oven_control/engineermenuwindow.h | 2 + app/gui/oven_control/functiontestwindow.cpp | 2 +- app/gui/oven_control/gasmodelsettingwindow.cpp | 62 ++ app/gui/oven_control/gasmodelsettingwindow.h | 41 ++ app/gui/oven_control/gasmodelsettingwindow.ui | 645 +++++++++++++++++++++ app/gui/oven_control/modelsettingwindow.cpp | 37 ++ app/gui/oven_control/modelsettingwindow.h | 30 + app/gui/oven_control/modelsettingwindow.ui | 381 ++++++++++++ app/gui/oven_control/oven_control.pro | 17 +- 13 files changed, 1766 insertions(+), 4 deletions(-) create mode 100644 app/gui/oven_control/electricmodelsettingwindow.cpp create mode 100644 app/gui/oven_control/electricmodelsettingwindow.h create mode 100644 app/gui/oven_control/electricmodelsettingwindow.ui create mode 100644 app/gui/oven_control/gasmodelsettingwindow.cpp create mode 100644 app/gui/oven_control/gasmodelsettingwindow.h create mode 100644 app/gui/oven_control/gasmodelsettingwindow.ui create mode 100644 app/gui/oven_control/modelsettingwindow.cpp create mode 100644 app/gui/oven_control/modelsettingwindow.h create mode 100644 app/gui/oven_control/modelsettingwindow.ui diff --git a/app/gui/oven_control/electricmodelsettingwindow.cpp b/app/gui/oven_control/electricmodelsettingwindow.cpp new file mode 100644 index 0000000..077b6f7 --- /dev/null +++ b/app/gui/oven_control/electricmodelsettingwindow.cpp @@ -0,0 +1,42 @@ +#include "electricmodelsettingwindow.h" +#include "ui_electricmodelsettingwindow.h" + +ElectricModelSettingWindow::ElectricModelSettingWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::ElectricModelSettingWindow) +{ + ui->setupUi(this); + + ui->clockContainer->setParent(ui->upperStack); + setAttribute(Qt::WA_DeleteOnClose); +} + +ElectricModelSettingWindow::~ElectricModelSettingWindow() +{ + delete ui; +} + +void ElectricModelSettingWindow::on_e10Button_clicked() +{ + +} + +void ElectricModelSettingWindow::on_e20Button_clicked() +{ + +} + +void ElectricModelSettingWindow::on_e24Button_clicked() +{ + +} + +void ElectricModelSettingWindow::on_e40Button_clicked() +{ + +} + +void ElectricModelSettingWindow::on_backButton_clicked() +{ + close(); +} diff --git a/app/gui/oven_control/electricmodelsettingwindow.h b/app/gui/oven_control/electricmodelsettingwindow.h new file mode 100644 index 0000000..ad0b95b --- /dev/null +++ b/app/gui/oven_control/electricmodelsettingwindow.h @@ -0,0 +1,33 @@ +#ifndef ELECTRICMODELSETTINGWINDOW_H +#define ELECTRICMODELSETTINGWINDOW_H + +#include + +namespace Ui { +class ElectricModelSettingWindow; +} + +class ElectricModelSettingWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit ElectricModelSettingWindow(QWidget *parent = 0); + ~ElectricModelSettingWindow(); + +private slots: + void on_e10Button_clicked(); + + void on_e20Button_clicked(); + + void on_e24Button_clicked(); + + void on_e40Button_clicked(); + + void on_backButton_clicked(); + +private: + Ui::ElectricModelSettingWindow *ui; +}; + +#endif // ELECTRICMODELSETTINGWINDOW_H diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui new file mode 100644 index 0000000..35ae986 --- /dev/null +++ b/app/gui/oven_control/electricmodelsettingwindow.ui @@ -0,0 +1,469 @@ + + + ElectricModelSettingWindow + + + + 0 + 0 + 900 + 1600 + + + + MainWindow + + + #centralwidget { background-image: url(:/images/background/config_service.png); } +#bottomBar { background-image: url(:/images/bottom_bar/background.png); } + + + + + + 127 + 804 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 24단 + + + + + + 39 + 525 + 821 + 65 + + + + background-image: url(:/images/config/pannel.png); + + + + + + 100 + 580 + 1 + 354 + + + + Qt::Vertical + + + + + + 100 + 933 + 30 + 1 + + + + Qt::Horizontal + + + + + + 80 + 525 + 500 + 65 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + 50 + false + + + + 제품모델설정 + + + + + + 127 + 898 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 40단 + + + + + + 55 + 426 + 845 + 84 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 서비스단계(엔지니어모드) > 제품모델설정 + + + + + + 100 + 651 + 30 + 1 + + + + Qt::Horizontal + + + + + + 100 + 839 + 30 + 1 + + + + Qt::Horizontal + + + + + + 600 + 525 + 251 + 65 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 75 + true + + + + EM-7 + + + Qt::AlignCenter + + + + + + 0 + 1450 + 900 + 150 + + + + + + 401 + 26 + 97 + 97 + + + + + 0 + 0 + + + + QPushButton { border-image: url(:/images/bottom_bar/back.png); } +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); } + + + + + + + + + + 127 + 616 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 10단 + + + + + + 127 + 710 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 20단 + + + + + + 100 + 745 + 30 + 1 + + + + Qt::Horizontal + + + + + + 0 + 0 + 900 + 426 + + + + + #clockContainer { background-image: url(:/images/clock/background.png); } + + + + + 272 + 36 + 356 + 355 + + + + + + + + + + + Clock + QWidget +
clock.h
+ 1 + + + + + diff --git a/app/gui/oven_control/engineermenuwindow.cpp b/app/gui/oven_control/engineermenuwindow.cpp index 07eda01..9e098f7 100644 --- a/app/gui/oven_control/engineermenuwindow.cpp +++ b/app/gui/oven_control/engineermenuwindow.cpp @@ -6,6 +6,7 @@ #include "functiontestwindow.h" #include "ovenstatics.h" #include "adjustmentwindow.h" +#include "modelsettingwindow.h" EngineerMenuWindow::EngineerMenuWindow(QWidget *parent) : QMainWindow(parent), @@ -67,3 +68,11 @@ void EngineerMenuWindow::on_stdConfigButton_clicked() { } + +void EngineerMenuWindow::on_modelTypeConfigButton_clicked() +{ + ModelSettingWindow *w = new ModelSettingWindow(this); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); +} diff --git a/app/gui/oven_control/engineermenuwindow.h b/app/gui/oven_control/engineermenuwindow.h index c60c730..b3ee6f1 100644 --- a/app/gui/oven_control/engineermenuwindow.h +++ b/app/gui/oven_control/engineermenuwindow.h @@ -28,6 +28,8 @@ private slots: void on_stdConfigButton_clicked(); + void on_modelTypeConfigButton_clicked(); + private: Ui::EngineerMenuWindow *ui; }; diff --git a/app/gui/oven_control/functiontestwindow.cpp b/app/gui/oven_control/functiontestwindow.cpp index 3dae585..fe782aa 100644 --- a/app/gui/oven_control/functiontestwindow.cpp +++ b/app/gui/oven_control/functiontestwindow.cpp @@ -17,7 +17,7 @@ FunctionTestWindow::FunctionTestWindow(QWidget *parent) : ui->clockContainer->setParent(ui->upperStack); setAttribute(Qt::WA_DeleteOnClose); - connect(ui->backButton, SIGNAL(clicked(bool)), this, SLOT(deleteLater())); + connect(ui->backButton, SIGNAL(clicked(bool)), SLOT(close())); } FunctionTestWindow::~FunctionTestWindow() diff --git a/app/gui/oven_control/gasmodelsettingwindow.cpp b/app/gui/oven_control/gasmodelsettingwindow.cpp new file mode 100644 index 0000000..36db203 --- /dev/null +++ b/app/gui/oven_control/gasmodelsettingwindow.cpp @@ -0,0 +1,62 @@ +#include "gasmodelsettingwindow.h" +#include "ui_gasmodelsettingwindow.h" + +GasModelSettingWindow::GasModelSettingWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::GasModelSettingWindow) +{ + ui->setupUi(this); + + ui->clockContainer->setParent(ui->upperStack); + setAttribute(Qt::WA_DeleteOnClose); +} + +GasModelSettingWindow::~GasModelSettingWindow() +{ + delete ui; +} + +void GasModelSettingWindow::on_lpg10Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lng10Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lpg20Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lng20Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lpg24Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lng24Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lpg40Button_clicked() +{ + +} + +void GasModelSettingWindow::on_lng40Button_clicked() +{ + +} + +void GasModelSettingWindow::on_backButton_clicked() +{ + close(); +} diff --git a/app/gui/oven_control/gasmodelsettingwindow.h b/app/gui/oven_control/gasmodelsettingwindow.h new file mode 100644 index 0000000..1db122d --- /dev/null +++ b/app/gui/oven_control/gasmodelsettingwindow.h @@ -0,0 +1,41 @@ +#ifndef GASMODELSETTINGWINDOW_H +#define GASMODELSETTINGWINDOW_H + +#include + +namespace Ui { +class GasModelSettingWindow; +} + +class GasModelSettingWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit GasModelSettingWindow(QWidget *parent = 0); + ~GasModelSettingWindow(); + +private slots: + 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(); + +private: + Ui::GasModelSettingWindow *ui; +}; + +#endif // GASMODELSETTINGWINDOW_H diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui new file mode 100644 index 0000000..83acf1a --- /dev/null +++ b/app/gui/oven_control/gasmodelsettingwindow.ui @@ -0,0 +1,645 @@ + + + GasModelSettingWindow + + + + 0 + 0 + 900 + 1600 + + + + MainWindow + + + #centralwidget { background-image: url(:/images/background/config_service.png); } +#bottomBar { background-image: url(:/images/bottom_bar/background.png); } + + + + + + 127 + 804 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 20단 LPG + + + + + + 39 + 525 + 821 + 65 + + + + background-image: url(:/images/config/pannel.png); + + + + + + 100 + 580 + 1 + 731 + + + + Qt::Vertical + + + + + + 100 + 933 + 30 + 1 + + + + Qt::Horizontal + + + + + + 100 + 1027 + 30 + 1 + + + + Qt::Horizontal + + + + + + 80 + 525 + 500 + 65 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + 50 + false + + + + 제품모델설정 + + + + + + 127 + 1086 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 24단 LNG + + + + + + 127 + 898 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 20단 LNG + + + + + + 127 + 992 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 24단 LPG + + + + + + 55 + 426 + 845 + 84 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 서비스단계(엔지니어모드) > 제품모델설정 + + + + + + 100 + 651 + 30 + 1 + + + + Qt::Horizontal + + + + + + 100 + 1121 + 30 + 1 + + + + Qt::Horizontal + + + + + + 100 + 839 + 30 + 1 + + + + Qt::Horizontal + + + + + + 600 + 525 + 251 + 65 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 75 + true + + + + EM-7 + + + Qt::AlignCenter + + + + + + 0 + 1450 + 900 + 150 + + + + + + 401 + 26 + 97 + 97 + + + + + 0 + 0 + + + + QPushButton { border-image: url(:/images/bottom_bar/back.png); } +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); } + + + + + + + + + + 127 + 616 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 10단 LPG + + + + + + 127 + 710 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 10단 LNG + + + + + + 100 + 745 + 30 + 1 + + + + Qt::Horizontal + + + + + + 0 + 0 + 900 + 426 + + + + + #clockContainer { background-image: url(:/images/clock/background.png); } + + + + + 272 + 36 + 356 + 355 + + + + + + + + + + 127 + 1180 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 40단 LPG + + + + + + 100 + 1215 + 30 + 1 + + + + Qt::Horizontal + + + + + + 100 + 1309 + 30 + 1 + + + + Qt::Horizontal + + + + + + 127 + 1274 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 40단 LNG + + + + + + + Clock + QWidget +
clock.h
+ 1 + + + + + diff --git a/app/gui/oven_control/modelsettingwindow.cpp b/app/gui/oven_control/modelsettingwindow.cpp new file mode 100644 index 0000000..30bc1ec --- /dev/null +++ b/app/gui/oven_control/modelsettingwindow.cpp @@ -0,0 +1,37 @@ +#include "modelsettingwindow.h" +#include "ui_modelsettingwindow.h" + +#include "electricmodelsettingwindow.h" +#include "gasmodelsettingwindow.h" + +ModelSettingWindow::ModelSettingWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::ModelSettingWindow) +{ + ui->setupUi(this); + + ui->clockContainer->setParent(ui->upperStack); + setAttribute(Qt::WA_DeleteOnClose); +} + +ModelSettingWindow::~ModelSettingWindow() +{ + delete ui; +} + +void ModelSettingWindow::on_electricButton_clicked() +{ + ElectricModelSettingWindow *w = new ElectricModelSettingWindow(this); + w->showFullScreen(); +} + +void ModelSettingWindow::on_gasButton_clicked() +{ + GasModelSettingWindow *w = new GasModelSettingWindow(this); + w->showFullScreen(); +} + +void ModelSettingWindow::on_backButton_clicked() +{ + close(); +} diff --git a/app/gui/oven_control/modelsettingwindow.h b/app/gui/oven_control/modelsettingwindow.h new file mode 100644 index 0000000..bfe5a7d --- /dev/null +++ b/app/gui/oven_control/modelsettingwindow.h @@ -0,0 +1,30 @@ +#ifndef MODELSETTINGWINDOW_H +#define MODELSETTINGWINDOW_H + +#include + +namespace Ui { +class ModelSettingWindow; +} + +class ModelSettingWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit ModelSettingWindow(QWidget *parent = 0); + ~ModelSettingWindow(); + +private slots: + + void on_electricButton_clicked(); + + void on_gasButton_clicked(); + + void on_backButton_clicked(); + +private: + Ui::ModelSettingWindow *ui; +}; + +#endif // MODELSETTINGWINDOW_H diff --git a/app/gui/oven_control/modelsettingwindow.ui b/app/gui/oven_control/modelsettingwindow.ui new file mode 100644 index 0000000..3981085 --- /dev/null +++ b/app/gui/oven_control/modelsettingwindow.ui @@ -0,0 +1,381 @@ + + + ModelSettingWindow + + + + 0 + 0 + 900 + 1600 + + + + MainWindow + + + #centralwidget { background-image: url(:/images/background/config_service.png); } +#bottomBar { background-image: url(:/images/bottom_bar/background.png); } + + + + + + 39 + 525 + 821 + 65 + + + + background-image: url(:/images/config/pannel.png); + + + + + + 100 + 580 + 1 + 166 + + + + Qt::Vertical + + + + + + 80 + 525 + 500 + 65 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + 50 + false + + + + 제품모델설정 + + + + + + 55 + 426 + 845 + 84 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 서비스단계(엔지니어모드) > 제품모델설정 + + + + + + 100 + 651 + 30 + 1 + + + + Qt::Horizontal + + + + + + 600 + 525 + 251 + 65 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 75 + true + + + + EM-7 + + + Qt::AlignCenter + + + + + + 0 + 1450 + 900 + 150 + + + + + + 401 + 26 + 97 + 97 + + + + + 0 + 0 + + + + QPushButton { border-image: url(:/images/bottom_bar/back.png); } +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); } + + + + + + + + + + 127 + 616 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 전기식 + + + + + + 127 + 710 + 379 + 70 + + + + + 0 + 0 + + + + + NanumGothic + 10 + 75 + true + + + + QPushButton { border-image: url(:/images/button/379.png); } +QPushButton:pressed { border-image: url(:/images/button/379_ov.png); } + + + 가스식 + + + + + + 100 + 745 + 30 + 1 + + + + Qt::Horizontal + + + + + + 0 + 0 + 900 + 426 + + + + + #clockContainer { background-image: url(:/images/clock/background.png); } + + + + + 272 + 36 + 356 + 355 + + + + + + + + + + + Clock + QWidget +
clock.h
+ 1 + + + + + diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index c1b9ec5..306670e 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -93,7 +93,11 @@ SOURCES += main.cpp\ confighalfenergydlg.cpp \ configinfodlg.cpp \ configipdlg.cpp \ - configfavoritebutton.cpp + configfavoritebutton.cpp \ + inputoverwatcher.cpp \ + modelsettingwindow.cpp \ + gasmodelsettingwindow.cpp \ + electricmodelsettingwindow.cpp HEADERS += mainwindow.h \ cook.h \ @@ -176,7 +180,11 @@ HEADERS += mainwindow.h \ confighalfenergydlg.h \ configinfodlg.h \ configipdlg.h \ - configfavoritebutton.h + configfavoritebutton.h \ + inputoverwatcher.h \ + modelsettingwindow.h \ + gasmodelsettingwindow.h \ + electricmodelsettingwindow.h FORMS += mainwindow.ui \ manualcookwindow.ui \ @@ -234,7 +242,10 @@ FORMS += mainwindow.ui \ confighalfenergydlg.ui \ configinfodlg.ui \ configipdlg.ui \ - configfavoritebutton.ui + configfavoritebutton.ui \ + modelsettingwindow.ui \ + gasmodelsettingwindow.ui \ + electricmodelsettingwindow.ui RESOURCES += \ resources.qrc -- 2.1.4