에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 1bb5ed9dc010a9d3fbe56d31f6b2fae4d104042c

Authored by 고영탁
1 parent 14a73498f6
Exists in master and in 2 other branches fhd, fhd-demo

popupwindow 삭제 

-사용하지 않는 팝업 윈도우 삭제
Showing 8 changed files with 68 additions and 34 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.cpp
  Diff comments   View file @1bb5ed9
@@ -0,0 +1,14 @@ @@ -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 +}
app/gui/oven_control/adjustmentwindow.h
  Diff comments   View file @1bb5ed9
@@ -0,0 +1,22 @@ @@ -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
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @1bb5ed9
@@ -0,0 +1,24 @@ @@ -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>
app/gui/oven_control/oven_control.pro
  Diff comments   View file @1bb5ed9
@@ -44,7 +44,6 @@ SOURCES += main.cpp\ @@ -44,7 +44,6 @@ SOURCES += main.cpp\
44 cooldownpopup.cpp \ 44 cooldownpopup.cpp \
45 engineermenuwindow.cpp \ 45 engineermenuwindow.cpp \
46 ovenstatics.cpp \ 46 ovenstatics.cpp \
47 - popupwindow.cpp \  
48 cookbook.cpp \ 47 cookbook.cpp \
49 define.cpp \ 48 define.cpp \
50 autocook.cpp \ 49 autocook.cpp \
@@ -61,7 +60,8 @@ SOURCES += main.cpp\ @@ -61,7 +60,8 @@ SOURCES += main.cpp\
61 realtimesensorwindow.cpp \ 60 realtimesensorwindow.cpp \
62 bulletindicator.cpp \ 61 bulletindicator.cpp \
63 soundplayer.cpp \ 62 soundplayer.cpp \
64 - servicedata.cpp 63 + servicedata.cpp \
  64 + adjustmentwindow.cpp
65 65
66 HEADERS += mainwindow.h \ 66 HEADERS += mainwindow.h \
67 cook.h \ 67 cook.h \
@@ -95,7 +95,6 @@ HEADERS += mainwindow.h \ @@ -95,7 +95,6 @@ HEADERS += mainwindow.h \
95 cooldownpopup.h \ 95 cooldownpopup.h \
96 engineermenuwindow.h \ 96 engineermenuwindow.h \
97 ovenstatics.h \ 97 ovenstatics.h \
98 - popupwindow.h \  
99 cookbook.h \ 98 cookbook.h \
100 define.h \ 99 define.h \
101 autocook.h \ 100 autocook.h \
@@ -112,7 +111,8 @@ HEADERS += mainwindow.h \ @@ -112,7 +111,8 @@ HEADERS += mainwindow.h \
112 realtimesensorwindow.h \ 111 realtimesensorwindow.h \
113 bulletindicator.h \ 112 bulletindicator.h \
114 soundplayer.h \ 113 soundplayer.h \
115 - servicedata.h 114 + servicedata.h \
  115 + adjustmentwindow.h
116 116
117 FORMS += mainwindow.ui \ 117 FORMS += mainwindow.ui \
118 manualcookwindow.ui \ 118 manualcookwindow.ui \
@@ -131,7 +131,6 @@ FORMS += mainwindow.ui \ @@ -131,7 +131,6 @@ FORMS += mainwindow.ui \
131 preheatpopup.ui \ 131 preheatpopup.ui \
132 cooldownpopup.ui \ 132 cooldownpopup.ui \
133 engineermenuwindow.ui \ 133 engineermenuwindow.ui \
134 - popupwindow.ui \  
135 keepwarmpopup.ui \ 134 keepwarmpopup.ui \
136 errorpopupdlg.ui \ 135 errorpopupdlg.ui \
137 servicehistorymain.ui \ 136 servicehistorymain.ui \
@@ -142,7 +141,8 @@ FORMS += mainwindow.ui \ @@ -142,7 +141,8 @@ FORMS += mainwindow.ui \
142 operationtimeparts.ui \ 141 operationtimeparts.ui \
143 realtimemain.ui \ 142 realtimemain.ui \
144 realtimepartswindow.ui \ 143 realtimepartswindow.ui \
145 - realtimesensorwindow.ui 144 + realtimesensorwindow.ui \
  145 + adjustmentwindow.ui
146 146
147 RESOURCES += \ 147 RESOURCES += \
148 resources.qrc 148 resources.qrc
app/gui/oven_control/ovenstatics.cpp
  Diff comments   View file @1bb5ed9
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
4 #include <QTimer> 4 #include <QTimer>
5 #include "mainwindow.h" 5 #include "mainwindow.h"
6 #include "ovencontroller.h" 6 #include "ovencontroller.h"
7 -#include "popupwindow.h"  
8 #include "engineermenuwindow.h" 7 #include "engineermenuwindow.h"
9 #include "errorpopupdlg.h" 8 #include "errorpopupdlg.h"
10 #include "historylistwindow.h" 9 #include "historylistwindow.h"
app/gui/oven_control/popupwindow.h
View file @14a7349
@@ -1,25 +0,0 @@ @@ -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  
app/gui/oven_control/servicedata.cpp
  Diff comments   View file @1bb5ed9
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 #define FRAM_TEST_PROCESS 0 8 #define FRAM_TEST_PROCESS 0
9 9
10 #define fRam_path "/sys/bus/spi/devices/spi0.0/fram" 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 ServiceData::ServiceData() 14 ServiceData::ServiceData()
app/gui/oven_control/udphandler.cpp
  Diff comments   View file @1bb5ed9
@@ -46,7 +46,7 @@ void UdpHandler::readPendingDatagrams() @@ -46,7 +46,7 @@ void UdpHandler::readPendingDatagrams()
46 46
47 void UdpHandler::processDatagram(QByteArray &datagram) 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 packet_t *packet = (packet_t *) datagram.data(); 50 packet_t *packet = (packet_t *) datagram.data();
51 switch (packet->header) 51 switch (packet->header)
52 { 52 {