GUI 버전 0.1.11

- 미구현 기능 접근 못하게 처리 - 엔지니어 모드의 교정 창에서 뒤로가기 버튼이 동작 안하는 문제 수정

GUI 버전 0.1.11
- 미구현 기능 접근 못하게 처리 - 엔지니어 모드의 교정 창에서 뒤로가기 버튼이 동작 안하는 문제 수정
김태훈
1 parent 1a93d524e9
Showing 4 changed files with 24 additions and 14 deletions Show diff stats
app/gui/oven_control/adjustmentwindow.cpp
app/gui/oven_control/adjustmentwindow.h
app/gui/oven_control/mainwindow.cpp
app/gui/oven_control/mainwindow.ui
@@ -8,6 +8,9 @@ AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
     ui(new Ui::AdjustmentWindow)
 {
     ui->setupUi(this);
+
+    ui->clockContainer->setParent(ui->upperStack);
+    setAttribute(Qt::WA_DeleteOnClose);
 }
  
 AdjustmentWindow::~AdjustmentWindow()
@@ -27,3 +30,8 @@ void AdjustmentWindow::on_btnAdjust_clicked()
     }
     else qDebug() <<"Rejected";
 }
+
+void AdjustmentWindow::on_backButton_clicked()
+{
+    close();
+}
@@ -18,6 +18,8 @@ public:
 private slots:
     void on_btnAdjust_clicked();
  
+    void on_backButton_clicked();
+
 private:
     Ui::AdjustmentWindow *ui;
 };
@@ -95,10 +95,10 @@ void MainWindow::on_etcButton_clicked()
  
 void MainWindow::on_primeButton_clicked()
 {
-    PrimeWindow *w = new PrimeWindow(this);
-    w->setWindowModality(Qt::WindowModal);
-    w->showFullScreen();
-    w->raise();
+//    PrimeWindow *w = new PrimeWindow(this);
+//    w->setWindowModality(Qt::WindowModal);
+//    w->showFullScreen();
+//    w->raise();
 }
  
 void MainWindow::on_washButton_clicked()
@@ -111,14 +111,14 @@ void MainWindow::on_washButton_clicked()
  
 void MainWindow::on_configButton_clicked()
 {
-    ConfigWindow *w = new ConfigWindow(this);
-    w->setWindowModality(Qt::WindowModal);
-    w->showFullScreen();
-    w->raise();
-//    EngineerMenuWindow *w = new EngineerMenuWindow(this);
+//    ConfigWindow *w = new ConfigWindow(this);
 //    w->setWindowModality(Qt::WindowModal);
 //    w->showFullScreen();
 //    w->raise();
+    EngineerMenuWindow *w = new EngineerMenuWindow(this);
+    w->setWindowModality(Qt::WindowModal);
+    w->showFullScreen();
+    w->raise();
 }
  
 void MainWindow::on_helpButton_clicked()
@@ -128,8 +128,8 @@ void MainWindow::on_helpButton_clicked()
  
 void MainWindow::on_programmingButton_clicked()
 {
-    ProgrammingWindow *w = new ProgrammingWindow(this);
-    w->setWindowModality(Qt::WindowModal);
-    w->showFullScreen();
-    w->raise();
+//    ProgrammingWindow *w = new ProgrammingWindow(this);
+//    w->setWindowModality(Qt::WindowModal);
+//    w->showFullScreen();
+//    w->raise();
 }
@@ -656,7 +656,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png
      </font>
     </property>
     <property name="text">
-     <string>V0.1.10</string>
+     <string>V0.1.11</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
...	...	@@ -8,6 +8,9 @@ AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
8	8	ui(new Ui::AdjustmentWindow)
9	9	{
10	10	ui->setupUi(this);
	11	+
	12	+ ui->clockContainer->setParent(ui->upperStack);
	13	+ setAttribute(Qt::WA_DeleteOnClose);
11	14	}
12	15
13	16	AdjustmentWindow::~AdjustmentWindow()
...	...	@@ -27,3 +30,8 @@ void AdjustmentWindow::on_btnAdjust_clicked()
27	30	}
28	31	else qDebug() <<"Rejected";
29	32	}
	33	+
	34	+void AdjustmentWindow::on_backButton_clicked()
	35	+{
	36	+ close();
	37	+}
...	...
...	...	@@ -18,6 +18,8 @@ public:
18	18	private slots:
19	19	void on_btnAdjust_clicked();
20	20
	21	+ void on_backButton_clicked();
	22	+
21	23	private:
22	24	Ui::AdjustmentWindow *ui;
23	25	};
...	...
...	...	@@ -95,10 +95,10 @@ void MainWindow::on_etcButton_clicked()
95	95
96	96	void MainWindow::on_primeButton_clicked()
97	97	{
98		- PrimeWindow *w = new PrimeWindow(this);
99		- w->setWindowModality(Qt::WindowModal);
100		- w->showFullScreen();
101		- w->raise();
	98	+// PrimeWindow *w = new PrimeWindow(this);
	99	+// w->setWindowModality(Qt::WindowModal);
	100	+// w->showFullScreen();
	101	+// w->raise();
102	102	}
103	103
104	104	void MainWindow::on_washButton_clicked()
...	...	@@ -111,14 +111,14 @@ void MainWindow::on_washButton_clicked()
111	111
112	112	void MainWindow::on_configButton_clicked()
113	113	{
114		- ConfigWindow *w = new ConfigWindow(this);
115		- w->setWindowModality(Qt::WindowModal);
116		- w->showFullScreen();
117		- w->raise();
118		-// EngineerMenuWindow *w = new EngineerMenuWindow(this);
	114	+// ConfigWindow *w = new ConfigWindow(this);
119	115	// w->setWindowModality(Qt::WindowModal);
120	116	// w->showFullScreen();
121	117	// w->raise();
	118	+ EngineerMenuWindow *w = new EngineerMenuWindow(this);
	119	+ w->setWindowModality(Qt::WindowModal);
	120	+ w->showFullScreen();
	121	+ w->raise();
122	122	}
123	123
124	124	void MainWindow::on_helpButton_clicked()
...	...	@@ -128,8 +128,8 @@ void MainWindow::on_helpButton_clicked()
128	128
129	129	void MainWindow::on_programmingButton_clicked()
130	130	{
131		- ProgrammingWindow *w = new ProgrammingWindow(this);
132		- w->setWindowModality(Qt::WindowModal);
133		- w->showFullScreen();
134		- w->raise();
	131	+// ProgrammingWindow *w = new ProgrammingWindow(this);
	132	+// w->setWindowModality(Qt::WindowModal);
	133	+// w->showFullScreen();
	134	+// w->raise();
135	135	}
...	...
...	...	@@ -656,7 +656,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png
656	656	</font>
657	657	</property>
658	658	<property name="text">
659		- <string>V0.1.10</string>
	659	+ <string>V0.1.11</string>
660	660	</property>
661	661	<property name="alignment">
662	662	<set>Qt::AlignBottom\|Qt::AlignRight\|Qt::AlignTrailing</set>
...	...