From 069c755078f16b5d3f8d2966191b1210fac168a6 Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Wed, 19 Apr 2017 16:52:58 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=A4=EC=A0=95=20?=
=?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EA=B8=B0=EB=8A=A5=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 이전 : 기능테스트 실행
- 변경 : 엔지니어모드 메뉴 실행
---
app/gui/oven_control/engineermenuwindow.cpp | 15 +++++++++++++--
app/gui/oven_control/engineermenuwindow.h | 6 +++++-
app/gui/oven_control/mainwindow.cpp | 10 ++--------
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/app/gui/oven_control/engineermenuwindow.cpp b/app/gui/oven_control/engineermenuwindow.cpp
index cb71113..e2ffa90 100644
--- a/app/gui/oven_control/engineermenuwindow.cpp
+++ b/app/gui/oven_control/engineermenuwindow.cpp
@@ -3,10 +3,12 @@
#include "servicehistorymain.h"
#include "operationtimemain.h"
#include "realtimemain.h"
+#include "functiontestwindow.h"
+#include "ovenstatics.h"
-engineermenuwindow::engineermenuwindow(QWidget *parent) :
+engineermenuwindow::engineermenuwindow(QWidget *parent, UdpHandler *udp) :
QMainWindow(parent),
- ui(new Ui::engineermenuwindow)
+ ui(new Ui::engineermenuwindow), udp(udp)
{
ui->setupUi(this);
@@ -14,6 +16,7 @@ engineermenuwindow::engineermenuwindow(QWidget *parent) :
//setAttribute(Qt::WA_DeleteOnClose);
connect(ui->backButton, SIGNAL(released()), this, SLOT(deleteLater()));
+
}
engineermenuwindow::~engineermenuwindow()
@@ -41,3 +44,11 @@ void engineermenuwindow::on_realdatabutton_clicked()
w->setWindowModality(Qt::WindowModal);
w->showFullScreen();
}
+
+void engineermenuwindow::on_functiontestbutton_clicked()
+{
+ FunctionTestWindow *w = new FunctionTestWindow(this, udp);
+ 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 2506a5a..1f467ad 100644
--- a/app/gui/oven_control/engineermenuwindow.h
+++ b/app/gui/oven_control/engineermenuwindow.h
@@ -2,6 +2,7 @@
#define ENGINEERMENUWINDOW_H
#include <QMainWindow>
+#include "udphandler.h"
namespace Ui {
class engineermenuwindow;
@@ -12,7 +13,7 @@ class engineermenuwindow : public QMainWindow
Q_OBJECT
public:
- explicit engineermenuwindow(QWidget *parent = 0);
+ explicit engineermenuwindow(QWidget *parent = 0 , UdpHandler *udp = 0);
~engineermenuwindow();
private slots:
@@ -22,8 +23,11 @@ private slots:
void on_realdatabutton_clicked();
+ void on_functiontestbutton_clicked();
+
private:
Ui::engineermenuwindow *ui;
+ UdpHandler *udp;
};
#endif // ENGINEERMENUWINDOW_H
diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp
index 8889808..1383630 100644
--- a/app/gui/oven_control/mainwindow.cpp
+++ b/app/gui/oven_control/mainwindow.cpp
@@ -67,11 +67,7 @@ void MainWindow::onModeButtonClicked(int mode)
void MainWindow::on_configButton_clicked()
{
-// ConfigWindow *w = new ConfigWindow(this, udp);
-// w->setAttribute(Qt::WA_DeleteOnClose);
-// w->showFullScreen();
-
- FunctionTestWindow *w = new FunctionTestWindow(this, udp);
+ engineermenuwindow *w = new engineermenuwindow(this, udp);
w->setWindowModality(Qt::WindowModal);
w->showFullScreen();
w->raise();
@@ -111,7 +107,5 @@ void MainWindow::on_washButton_clicked()
void MainWindow::on_helpButton_clicked()
{
- engineermenuwindow *w = new engineermenuwindow(this);
- w->setWindowModality(Qt::WindowModal);
- w->showFullScreen();
+
}
--
2.1.4