popupwindow 삭제

-사용하지 않는 팝업 윈도우 삭제

popupwindow 삭제
-사용하지 않는 팝업 윈도우 삭제
고영탁
1 parent 14a73498f6
Showing 8 changed files with 68 additions and 34 deletions Show diff stats
app/gui/oven_control/adjustmentwindow.cpp
app/gui/oven_control/adjustmentwindow.h
app/gui/oven_control/adjustmentwindow.ui
app/gui/oven_control/oven_control.pro
app/gui/oven_control/ovenstatics.cpp
app/gui/oven_control/popupwindow.h
app/gui/oven_control/servicedata.cpp
app/gui/oven_control/udphandler.cpp
@@ -0,0 +1,14 @@
+#include "adjustmentwindow.h"
+#include "ui_adjustmentwindow.h"
+
+AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::AdjustmentWindow)
+{
+    ui->setupUi(this);
+}
+
+AdjustmentWindow::~AdjustmentWindow()
+{
+    delete ui;
+}
@@ -0,0 +1,22 @@
+#ifndef ADJUSTMENTWINDOW_H
+#define ADJUSTMENTWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class AdjustmentWindow;
+}
+
+class AdjustmentWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit AdjustmentWindow(QWidget *parent = 0);
+    ~AdjustmentWindow();
+
+private:
+    Ui::AdjustmentWindow *ui;
+};
+
+#endif // ADJUSTMENTWINDOW_H
@@ -0,0 +1,24 @@
+<ui version="4.0">
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>AdjustmentWindow</class>
+ <widget class="QMainWindow" name="AdjustmentWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QMenuBar" name="menubar"/>
+  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>
@@ -44,7 +44,6 @@ SOURCES += main.cpp\
     cooldownpopup.cpp \
     engineermenuwindow.cpp \
     ovenstatics.cpp \
-    popupwindow.cpp \
     cookbook.cpp \
     define.cpp \
     autocook.cpp \
@@ -61,7 +60,8 @@ SOURCES += main.cpp\
     realtimesensorwindow.cpp \
     bulletindicator.cpp \
     soundplayer.cpp \
-    servicedata.cpp
+    servicedata.cpp \
+    adjustmentwindow.cpp
  
 HEADERS  += mainwindow.h \
     cook.h \
@@ -95,7 +95,6 @@ HEADERS  += mainwindow.h \
     cooldownpopup.h \
     engineermenuwindow.h \
     ovenstatics.h \
-    popupwindow.h \
     cookbook.h \
     define.h \
     autocook.h \
@@ -112,7 +111,8 @@ HEADERS  += mainwindow.h \
     realtimesensorwindow.h \
     bulletindicator.h \
     soundplayer.h \
-    servicedata.h
+    servicedata.h \
+    adjustmentwindow.h
  
 FORMS    += mainwindow.ui \
     manualcookwindow.ui \
@@ -131,7 +131,6 @@ FORMS    += mainwindow.ui \
     preheatpopup.ui \
     cooldownpopup.ui \
     engineermenuwindow.ui \
-    popupwindow.ui \
     keepwarmpopup.ui \
     errorpopupdlg.ui \
     servicehistorymain.ui \
@@ -142,7 +141,8 @@ FORMS    += mainwindow.ui \
     operationtimeparts.ui \
     realtimemain.ui \
     realtimepartswindow.ui \
-    realtimesensorwindow.ui
+    realtimesensorwindow.ui \
+    adjustmentwindow.ui
  
 RESOURCES += \
     resources.qrc
@@ -4,7 +4,6 @@
 #include <QTimer>
 #include "mainwindow.h"
 #include "ovencontroller.h"
-#include "popupwindow.h"
 #include "engineermenuwindow.h"
 #include "errorpopupdlg.h"
 #include "historylistwindow.h"
@@ -1,25 +0,0 @@
-#ifndef POPUPWINDOW_H
-#define POPUPWINDOW_H
-
-#include <QMainWindow>
-
-namespace Ui {
-class popupWindow;
-}
-
-class popupWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    explicit popupWindow(QWidget *parent = 0, const QString &MsgDesc=0);
-    ~popupWindow();
-
-private slots:
-    void on_ctrlOkBtn_released();
-
-private:
-    Ui::popupWindow *ui;
-};
-
-#endif // POPUPWINDOW_H
@@ -8,7 +8,7 @@
 #define FRAM_TEST_PROCESS   0
  
 #define fRam_path  "/sys/bus/spi/devices/spi0.0/fram"
-#define INIT_FRAM   1
+#define INIT_FRAM   0 //시작시 RRAM 초기화
  
  
 ServiceData::ServiceData()
@@ -46,7 +46,7 @@ void UdpHandler::readPendingDatagrams()
  
 void UdpHandler::processDatagram(QByteArray &datagram)
 {
-    sock->writeDatagram(datagram, QHostAddress("192.168.4.191"), 40001);
+    sock->writeDatagram(datagram, QHostAddress("192.168.4.70"), 40001);
     packet_t *packet = (packet_t *) datagram.data();
     switch (packet->header)
     {
...	...	@@ -0,0 +1,14 @@
	1	+#include "adjustmentwindow.h"
	2	+#include "ui_adjustmentwindow.h"
	3	+
	4	+AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
	5	+ QMainWindow(parent),
	6	+ ui(new Ui::AdjustmentWindow)
	7	+{
	8	+ ui->setupUi(this);
	9	+}
	10	+
	11	+AdjustmentWindow::~AdjustmentWindow()
	12	+{
	13	+ delete ui;
	14	+}
...	...
...	...	@@ -0,0 +1,22 @@
	1	+#ifndef ADJUSTMENTWINDOW_H
	2	+#define ADJUSTMENTWINDOW_H
	3	+
	4	+#include <QMainWindow>
	5	+
	6	+namespace Ui {
	7	+class AdjustmentWindow;
	8	+}
	9	+
	10	+class AdjustmentWindow : public QMainWindow
	11	+{
	12	+ Q_OBJECT
	13	+
	14	+public:
	15	+ explicit AdjustmentWindow(QWidget *parent = 0);
	16	+ ~AdjustmentWindow();
	17	+
	18	+private:
	19	+ Ui::AdjustmentWindow *ui;
	20	+};
	21	+
	22	+#endif // ADJUSTMENTWINDOW_H
...	...
...	...	@@ -0,0 +1,24 @@
	1	+<ui version="4.0">
	2	+ <author/>
	3	+ <comment/>
	4	+ <exportmacro/>
	5	+ <class>AdjustmentWindow</class>
	6	+ <widget class="QMainWindow" name="AdjustmentWindow">
	7	+ <property name="geometry">
	8	+ <rect>
	9	+ <x>0</x>
	10	+ <y>0</y>
	11	+ <width>800</width>
	12	+ <height>600</height>
	13	+ </rect>
	14	+ </property>
	15	+ <property name="windowTitle">
	16	+ <string>MainWindow</string>
	17	+ </property>
	18	+ <widget class="QMenuBar" name="menubar"/>
	19	+ <widget class="QWidget" name="centralwidget"/>
	20	+ <widget class="QStatusBar" name="statusbar"/>
	21	+ </widget>
	22	+ <pixmapfunction/>
	23	+ <connections/>
	24	+</ui>
...	...
...	...	@@ -44,7 +44,6 @@ SOURCES += main.cpp\
44	44	cooldownpopup.cpp \
45	45	engineermenuwindow.cpp \
46	46	ovenstatics.cpp \
47		- popupwindow.cpp \
48	47	cookbook.cpp \
49	48	define.cpp \
50	49	autocook.cpp \
...	...	@@ -61,7 +60,8 @@ SOURCES += main.cpp\
61	60	realtimesensorwindow.cpp \
62	61	bulletindicator.cpp \
63	62	soundplayer.cpp \
64		- servicedata.cpp
	63	+ servicedata.cpp \
	64	+ adjustmentwindow.cpp
65	65
66	66	HEADERS += mainwindow.h \
67	67	cook.h \
...	...	@@ -95,7 +95,6 @@ HEADERS += mainwindow.h \
95	95	cooldownpopup.h \
96	96	engineermenuwindow.h \
97	97	ovenstatics.h \
98		- popupwindow.h \
99	98	cookbook.h \
100	99	define.h \
101	100	autocook.h \
...	...	@@ -112,7 +111,8 @@ HEADERS += mainwindow.h \
112	111	realtimesensorwindow.h \
113	112	bulletindicator.h \
114	113	soundplayer.h \
115		- servicedata.h
	114	+ servicedata.h \
	115	+ adjustmentwindow.h
116	116
117	117	FORMS += mainwindow.ui \
118	118	manualcookwindow.ui \
...	...	@@ -131,7 +131,6 @@ FORMS += mainwindow.ui \
131	131	preheatpopup.ui \
132	132	cooldownpopup.ui \
133	133	engineermenuwindow.ui \
134		- popupwindow.ui \
135	134	keepwarmpopup.ui \
136	135	errorpopupdlg.ui \
137	136	servicehistorymain.ui \
...	...	@@ -142,7 +141,8 @@ FORMS += mainwindow.ui \
142	141	operationtimeparts.ui \
143	142	realtimemain.ui \
144	143	realtimepartswindow.ui \
145		- realtimesensorwindow.ui
	144	+ realtimesensorwindow.ui \
	145	+ adjustmentwindow.ui
146	146
147	147	RESOURCES += \
148	148	resources.qrc
...	...
...	...	@@ -4,7 +4,6 @@
4	4	#include <QTimer>
5	5	#include "mainwindow.h"
6	6	#include "ovencontroller.h"
7		-#include "popupwindow.h"
8	7	#include "engineermenuwindow.h"
9	8	#include "errorpopupdlg.h"
10	9	#include "historylistwindow.h"
...	...
...	...	@@ -1,25 +0,0 @@
1		-#ifndef POPUPWINDOW_H
2		-#define POPUPWINDOW_H
3		-
4		-#include <QMainWindow>
5		-
6		-namespace Ui {
7		-class popupWindow;
8		-}
9		-
10		-class popupWindow : public QMainWindow
11		-{
12		- Q_OBJECT
13		-
14		-public:
15		- explicit popupWindow(QWidget *parent = 0, const QString &MsgDesc=0);
16		- ~popupWindow();
17		-
18		-private slots:
19		- void on_ctrlOkBtn_released();
20		-
21		-private:
22		- Ui::popupWindow *ui;
23		-};
24		-
25		-#endif // POPUPWINDOW_H
...	...	@@ -8,7 +8,7 @@
8	8	#define FRAM_TEST_PROCESS 0
9	9
10	10	#define fRam_path "/sys/bus/spi/devices/spi0.0/fram"
11		-#define INIT_FRAM 1
	11	+#define INIT_FRAM 0 //시작시 RRAM 초기화
12	12
13	13
14	14	ServiceData::ServiceData()
...	...
...	...	@@ -46,7 +46,7 @@ void UdpHandler::readPendingDatagrams()
46	46
47	47	void UdpHandler::processDatagram(QByteArray &datagram)
48	48	{
49		- sock->writeDatagram(datagram, QHostAddress("192.168.4.191"), 40001);
	49	+ sock->writeDatagram(datagram, QHostAddress("192.168.4.70"), 40001);
50	50	packet_t packet = (packet_t ) datagram.data();
51	51	switch (packet->header)
52	52	{
...	...