에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 453d18662f40107f6b6ba8a3dadef3111b373798

Authored by 김태훈
1 parent 1a93d524e9
Exists in master and in 2 other branches fhd, fhd-demo

GUI 버전 0.1.11 

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