에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit c03c0ecca5ccf413bddcd1a45b6b1ac4e5bc7696

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

메뉴얼 보기 기능 추가 

 - 메뉴얼 기능 추가
Showing 12 changed files with 56 additions and 2 deletions   Show diff stats
app/gui/oven_control/configwindow.cpp
  Diff comments   View file @c03c0ec
@@ -445,6 +445,7 @@ void ConfigWindow::on_washButton_clicked() @@ -445,6 +445,7 @@ void ConfigWindow::on_washButton_clicked()
445 void ConfigWindow::on_helpButton_clicked() 445 void ConfigWindow::on_helpButton_clicked()
446 { 446 {
447 ManualViewerDlg* dlg = new ManualViewerDlg(this); 447 ManualViewerDlg* dlg = new ManualViewerDlg(this);
448 - dlg->exec(); 448 + dlg->showFullScreen();
  449 + dlg->raise();
449 } 450 }
450 451
app/gui/oven_control/mainwindow.cpp
  Diff comments   View file @c03c0ec
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 #include "ovenstatics.h" 14 #include "ovenstatics.h"
15 #include "notipopupdlg.h" 15 #include "notipopupdlg.h"
16 #include "multicookwindow.h" 16 #include "multicookwindow.h"
  17 +#include "manualviewerdlg.h"
17 18
18 MainWindow *MainWindow::instance = NULL; 19 MainWindow *MainWindow::instance = NULL;
19 20
@@ -275,5 +276,7 @@ void MainWindow::on_configButton_clicked() @@ -275,5 +276,7 @@ void MainWindow::on_configButton_clicked()
275 276
276 void MainWindow::on_helpButton_clicked() 277 void MainWindow::on_helpButton_clicked()
277 { 278 {
278 - 279 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  280 + dlg->showFullScreen();
  281 + dlg->raise();
279 } 282 }
app/gui/oven_control/operationtimeheat.cpp
  Diff comments   View file @c03c0ec
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 #include "ui_operationtimeheat.h" 3 #include "ui_operationtimeheat.h"
4 #include "ovenstatics.h" 4 #include "ovenstatics.h"
5 #include "soundplayer.h" 5 #include "soundplayer.h"
  6 +#include "manualviewerdlg.h"
6 7
7 OperationTimeHeat::OperationTimeHeat(QWidget *parent) : 8 OperationTimeHeat::OperationTimeHeat(QWidget *parent) :
8 QMainWindow(parent), 9 QMainWindow(parent),
@@ -105,3 +106,10 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event) @@ -105,3 +106,10 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event)
105 break; 106 break;
106 } 107 }
107 } 108 }
  109 +
  110 +void OperationTimeHeat::on_helpButton_clicked()
  111 +{
  112 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  113 + dlg->showFullScreen();
  114 + dlg->raise();
  115 +}
app/gui/oven_control/operationtimeheat.h
  Diff comments   View file @c03c0ec
@@ -26,6 +26,8 @@ private slots: @@ -26,6 +26,8 @@ private slots:
26 26
27 void on_backButton_clicked(); 27 void on_backButton_clicked();
28 28
  29 + void on_helpButton_clicked();
  30 +
29 private: 31 private:
30 Ui::OperationTimeHeat *ui; 32 Ui::OperationTimeHeat *ui;
31 void reloadUI(void); 33 void reloadUI(void);
app/gui/oven_control/operationtimemode.cpp
  Diff comments   View file @c03c0ec
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 #include "ui_operationtimemode.h" 3 #include "ui_operationtimemode.h"
4 #include "ovenstatics.h" 4 #include "ovenstatics.h"
5 #include "soundplayer.h" 5 #include "soundplayer.h"
  6 +#include "manualviewerdlg.h"
6 7
7 OperationTimeMode::OperationTimeMode(QWidget *parent) : 8 OperationTimeMode::OperationTimeMode(QWidget *parent) :
8 QMainWindow(parent), 9 QMainWindow(parent),
@@ -133,3 +134,10 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event) @@ -133,3 +134,10 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event)
133 break; 134 break;
134 } 135 }
135 } 136 }
  137 +
  138 +void OperationTimeMode::on_helpButton_clicked()
  139 +{
  140 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  141 + dlg->showFullScreen();
  142 + dlg->raise();
  143 +}
app/gui/oven_control/operationtimemode.h
  Diff comments   View file @c03c0ec
@@ -22,6 +22,8 @@ protected: @@ -22,6 +22,8 @@ protected:
22 private slots: 22 private slots:
23 void on_backButton_clicked(); 23 void on_backButton_clicked();
24 24
  25 + void on_helpButton_clicked();
  26 +
25 private: 27 private:
26 Ui::OperationTimeMode *ui; 28 Ui::OperationTimeMode *ui;
27 void reloadUi(void); 29 void reloadUi(void);
app/gui/oven_control/operationtimeparts.cpp
  Diff comments   View file @c03c0ec
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 #include "ui_operationtimeparts.h" 4 #include "ui_operationtimeparts.h"
5 #include "ovenstatics.h" 5 #include "ovenstatics.h"
6 #include "soundplayer.h" 6 #include "soundplayer.h"
  7 +#include "manualviewerdlg.h"
7 8
8 OperationTimeParts::OperationTimeParts(QWidget *parent) : 9 OperationTimeParts::OperationTimeParts(QWidget *parent) :
9 QMainWindow(parent), 10 QMainWindow(parent),
@@ -144,3 +145,10 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event) @@ -144,3 +145,10 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event)
144 break; 145 break;
145 } 146 }
146 } 147 }
  148 +
  149 +void OperationTimeParts::on_helpButton_clicked()
  150 +{
  151 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  152 + dlg->showFullScreen();
  153 + dlg->raise();
  154 +}
app/gui/oven_control/operationtimeparts.h
  Diff comments   View file @c03c0ec
@@ -27,6 +27,8 @@ private slots: @@ -27,6 +27,8 @@ private slots:
27 27
28 void onBtnResetsClicked(int); 28 void onBtnResetsClicked(int);
29 29
  30 + void on_helpButton_clicked();
  31 +
30 protected: 32 protected:
31 void keyPressEvent(QKeyEvent *event); 33 void keyPressEvent(QKeyEvent *event);
32 void keyReleaseEvent(QKeyEvent *event); 34 void keyReleaseEvent(QKeyEvent *event);
app/gui/oven_control/realtimepartswindow.cpp
  Diff comments   View file @c03c0ec
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 #include "ui_realtimepartswindow.h" 3 #include "ui_realtimepartswindow.h"
4 #include "ovenstatics.h" 4 #include "ovenstatics.h"
5 #include "soundplayer.h" 5 #include "soundplayer.h"
  6 +#include "manualviewerdlg.h"
6 7
7 RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : 8 RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) :
8 QMainWindow(parent), 9 QMainWindow(parent),
@@ -159,3 +160,10 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event) @@ -159,3 +160,10 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event)
159 break; 160 break;
160 } 161 }
161 } 162 }
  163 +
  164 +void RealtimePartsWindow::on_helpButton_clicked()
  165 +{
  166 + ManualViewerDlg *dlg = new ManualViewerDlg(this);
  167 + dlg->showFullScreen();
  168 + dlg->raise();
  169 +}
app/gui/oven_control/realtimepartswindow.h
  Diff comments   View file @c03c0ec
@@ -28,6 +28,8 @@ private slots: @@ -28,6 +28,8 @@ private slots:
28 void on_backButton_clicked(); 28 void on_backButton_clicked();
29 void oneSecTimerFired(void); 29 void oneSecTimerFired(void);
30 30
  31 + void on_helpButton_clicked();
  32 +
31 private: 33 private:
32 Ui::RealtimePartsWindow *ui; 34 Ui::RealtimePartsWindow *ui;
33 QLabel *m_arrLbState[CONTROL_LIST_COL_MAX][CONTROL_LIST_ITEM_MAX]; 35 QLabel *m_arrLbState[CONTROL_LIST_COL_MAX][CONTROL_LIST_ITEM_MAX];
app/gui/oven_control/realtimesensorwindow.cpp
  Diff comments   View file @c03c0ec
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 #include "stringer.h" 5 #include "stringer.h"
6 #include "QDateTime" 6 #include "QDateTime"
7 #include "soundplayer.h" 7 #include "soundplayer.h"
  8 +#include "manualviewerdlg.h"
8 9
9 RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : 10 RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) :
10 QMainWindow(parent), 11 QMainWindow(parent),
@@ -186,3 +187,10 @@ void RealtimeSensorWindow::on_resetButton_clicked() @@ -186,3 +187,10 @@ void RealtimeSensorWindow::on_resetButton_clicked()
186 ovs->resetSensorHistory(); 187 ovs->resetSensorHistory();
187 reloadUi(); 188 reloadUi();
188 } 189 }
  190 +
  191 +void RealtimeSensorWindow::on_helpButton_clicked()
  192 +{
  193 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  194 + dlg->showFullScreen();
  195 + dlg->raise();
  196 +}
app/gui/oven_control/realtimesensorwindow.h
  Diff comments   View file @c03c0ec
@@ -30,6 +30,8 @@ private slots: @@ -30,6 +30,8 @@ private slots:
30 30
31 void on_resetButton_clicked(); 31 void on_resetButton_clicked();
32 32
  33 + void on_helpButton_clicked();
  34 +
33 private: 35 private:
34 const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={ 36 const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={
35 0,1,3,4,5,6,7,8,12,13 37 0,1,3,4,5,6,7,8,12,13