메인 설정 버튼 기능 변경

- 이전 : 기능테스트 실행 - 변경 : 엔지니어모드 메뉴 실행

메인 설정 버튼 기능 변경
- 이전 : 기능테스트 실행 - 변경 : 엔지니어모드 메뉴 실행
고영탁
1 parent 6defa93ae3
Showing 3 changed files with 20 additions and 11 deletions Show diff stats
app/gui/oven_control/engineermenuwindow.cpp
app/gui/oven_control/engineermenuwindow.h
app/gui/oven_control/mainwindow.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();
+}
@@ -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
@@ -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();
+
 }