Commit edb71b96dd6cd1888449892b3555075d88df9a2f
Exists in
master
and in
2 other branches
Merge branch 'master' of 192.168.10.12:falinux/1611_0007_prime_oven
Showing
109 changed files
Show diff stats
app/gui/oven_control/autocookconfigwindow.cpp
| @@ -13,6 +13,7 @@ | @@ -13,6 +13,7 @@ | ||
| 13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
| 14 | #include "autocookselectionpopup.h" | 14 | #include "autocookselectionpopup.h" |
| 15 | #include "autocookcheckwindow.h" | 15 | #include "autocookcheckwindow.h" |
| 16 | +#include "manualviewerdlg.h" | ||
| 16 | 17 | ||
| 17 | AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) : | 18 | AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) : |
| 18 | QMainWindow(parent), | 19 | QMainWindow(parent), |
| @@ -471,3 +472,10 @@ void AutoCookConfigWindow::on_checkCookButton_clicked() | @@ -471,3 +472,10 @@ void AutoCookConfigWindow::on_checkCookButton_clicked() | ||
| 471 | connect(w, SIGNAL(back()), &afterThreeSecsTimer, SLOT(start())); | 472 | connect(w, SIGNAL(back()), &afterThreeSecsTimer, SLOT(start())); |
| 472 | } | 473 | } |
| 473 | } | 474 | } |
| 475 | + | ||
| 476 | +void AutoCookConfigWindow::on_helpButton_clicked() | ||
| 477 | +{ | ||
| 478 | + ManualViewerDlg* dlg = new ManualViewerDlg(this, AUTO_COOK_PAGE); | ||
| 479 | + dlg->showFullScreen(); | ||
| 480 | + dlg->raise(); | ||
| 481 | +} |
app/gui/oven_control/autocookconfigwindow.h
| @@ -75,6 +75,7 @@ private slots: | @@ -75,6 +75,7 @@ private slots: | ||
| 75 | void on_configButton_5_clicked(); | 75 | void on_configButton_5_clicked(); |
| 76 | void on_selectCookButton_clicked(); | 76 | void on_selectCookButton_clicked(); |
| 77 | void on_checkCookButton_clicked(); | 77 | void on_checkCookButton_clicked(); |
| 78 | + void on_helpButton_clicked(); | ||
| 78 | }; | 79 | }; |
| 79 | 80 | ||
| 80 | #endif // AUTOCOOKCONFIGWINDOW_H | 81 | #endif // AUTOCOOKCONFIGWINDOW_H |
app/gui/oven_control/autocookselectionwindow.cpp
| @@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
| 10 | #include "configwindow.h" | 10 | #include "configwindow.h" |
| 11 | #include "washwindow.h" | 11 | #include "washwindow.h" |
| 12 | #include "mainwindow.h" | 12 | #include "mainwindow.h" |
| 13 | +#include "manualviewerdlg.h" | ||
| 13 | 14 | ||
| 14 | AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookType type) : | 15 | AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookType type) : |
| 15 | QMainWindow(parent), | 16 | QMainWindow(parent), |
| @@ -148,7 +149,9 @@ void AutoCookSelectionWindow::on_washButton_clicked() | @@ -148,7 +149,9 @@ void AutoCookSelectionWindow::on_washButton_clicked() | ||
| 148 | 149 | ||
| 149 | void AutoCookSelectionWindow::on_helpButton_clicked() | 150 | void AutoCookSelectionWindow::on_helpButton_clicked() |
| 150 | { | 151 | { |
| 151 | - | 152 | + ManualViewerDlg* dlg = new ManualViewerDlg(this, AUTO_COOK_PAGE); |
| 153 | + dlg->showFullScreen(); | ||
| 154 | + dlg->raise(); | ||
| 152 | } | 155 | } |
| 153 | 156 | ||
| 154 | void AutoCookSelectionWindow::onEncoderLeft() | 157 | void AutoCookSelectionWindow::onEncoderLeft() |
app/gui/oven_control/autocookwindow.cpp
| @@ -16,6 +16,7 @@ | @@ -16,6 +16,7 @@ | ||
| 16 | #include "errorpopupdlg.h" | 16 | #include "errorpopupdlg.h" |
| 17 | #include "autocookselectionpopup.h" | 17 | #include "autocookselectionpopup.h" |
| 18 | #include "autocookcheckconfigwindow.h" | 18 | #include "autocookcheckconfigwindow.h" |
| 19 | +#include "manualviewerdlg.h" | ||
| 19 | 20 | ||
| 20 | AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : | 21 | AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : |
| 21 | QMainWindow(parent), | 22 | QMainWindow(parent), |
| @@ -1111,5 +1112,7 @@ void AutoCookWindow::on_washButton_clicked() | @@ -1111,5 +1112,7 @@ void AutoCookWindow::on_washButton_clicked() | ||
| 1111 | 1112 | ||
| 1112 | void AutoCookWindow::on_helpButton_clicked() | 1113 | void AutoCookWindow::on_helpButton_clicked() |
| 1113 | { | 1114 | { |
| 1114 | - | 1115 | + ManualViewerDlg* dlg = new ManualViewerDlg(this, AUTO_COOK_PAGE); |
| 1116 | + dlg->showFullScreen(); | ||
| 1117 | + dlg->raise(); | ||
| 1115 | } | 1118 | } |
app/gui/oven_control/basicsettingwindow.cpp
| @@ -1,46 +0,0 @@ | @@ -1,46 +0,0 @@ | ||
| 1 | -#include "basicsettingwindow.h" | ||
| 2 | -#include "ui_basicsettingwindow.h" | ||
| 3 | - | ||
| 4 | -#include "soundplayer.h" | ||
| 5 | - | ||
| 6 | -BasicSettingWindow::BasicSettingWindow(QWidget *parent) : | ||
| 7 | - QMainWindow(parent), | ||
| 8 | - ui(new Ui::BasicSettingWindow) | ||
| 9 | -{ | ||
| 10 | - ui->setupUi(this); | ||
| 11 | - | ||
| 12 | - foreach (QPushButton *button, findChildren<QPushButton *>()) | ||
| 13 | - connect(button, &QPushButton::pressed, SoundPlayer::playClick); | ||
| 14 | -} | ||
| 15 | - | ||
| 16 | -BasicSettingWindow::~BasicSettingWindow() | ||
| 17 | -{ | ||
| 18 | - delete ui; | ||
| 19 | -} | ||
| 20 | - | ||
| 21 | -void BasicSettingWindow::keyPressEvent(QKeyEvent *event) | ||
| 22 | -{ | ||
| 23 | - | ||
| 24 | -} | ||
| 25 | - | ||
| 26 | -void BasicSettingWindow::keyReleaseEvent(QKeyEvent *event) | ||
| 27 | -{ | ||
| 28 | - | ||
| 29 | -} | ||
| 30 | - | ||
| 31 | -void BasicSettingWindow::onEncoderLeft() | ||
| 32 | -{ | ||
| 33 | - focusPreviousChild(); | ||
| 34 | -} | ||
| 35 | - | ||
| 36 | -void BasicSettingWindow::onEncoderRight() | ||
| 37 | -{ | ||
| 38 | - focusNextChild(); | ||
| 39 | -} | ||
| 40 | - | ||
| 41 | -void BasicSettingWindow::onEncoderClicked(QWidget *clicked) | ||
| 42 | -{ | ||
| 43 | - QPushButton *b = qobject_cast<QPushButton *>(clicked); | ||
| 44 | - if (b) | ||
| 45 | - b->click(); | ||
| 46 | -} |
app/gui/oven_control/basicsettingwindow.h
| @@ -1,32 +0,0 @@ | @@ -1,32 +0,0 @@ | ||
| 1 | -#ifndef BASICSETTINGWINDOW_H | ||
| 2 | -#define BASICSETTINGWINDOW_H | ||
| 3 | - | ||
| 4 | -#include <QMainWindow> | ||
| 5 | - | ||
| 6 | -namespace Ui { | ||
| 7 | -class BasicSettingWindow; | ||
| 8 | -} | ||
| 9 | - | ||
| 10 | -class BasicSettingWindow : public QMainWindow | ||
| 11 | -{ | ||
| 12 | - Q_OBJECT | ||
| 13 | - | ||
| 14 | -public: | ||
| 15 | - explicit BasicSettingWindow(QWidget *parent = 0); | ||
| 16 | - ~BasicSettingWindow(); | ||
| 17 | - | ||
| 18 | -protected: | ||
| 19 | - void keyPressEvent(QKeyEvent *event); | ||
| 20 | - void keyReleaseEvent(QKeyEvent *event); | ||
| 21 | - | ||
| 22 | -private: | ||
| 23 | - Ui::BasicSettingWindow *ui; | ||
| 24 | - | ||
| 25 | - QWidget *pushed = NULL; | ||
| 26 | - | ||
| 27 | - void onEncoderLeft(); | ||
| 28 | - void onEncoderRight(); | ||
| 29 | - void onEncoderClicked(QWidget *clicked); | ||
| 30 | -}; | ||
| 31 | - | ||
| 32 | -#endif // BASICSETTINGWINDOW_H |
app/gui/oven_control/basicsettingwindow.ui
| @@ -1,470 +0,0 @@ | @@ -1,470 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<ui version="4.0"> | ||
| 3 | - <class>BasicSettingWindow</class> | ||
| 4 | - <widget class="QMainWindow" name="BasicSettingWindow"> | ||
| 5 | - <property name="geometry"> | ||
| 6 | - <rect> | ||
| 7 | - <x>0</x> | ||
| 8 | - <y>0</y> | ||
| 9 | - <width>900</width> | ||
| 10 | - <height>1600</height> | ||
| 11 | - </rect> | ||
| 12 | - </property> | ||
| 13 | - <property name="styleSheet"> | ||
| 14 | - <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | ||
| 15 | -#bottomBar { background-image: url(:/images/bottom_bar/background.png); } | ||
| 16 | -#midWidget { background-image: url(:/images/config/service/basic_setting_bgnd.png); }</string> | ||
| 17 | - </property> | ||
| 18 | - <widget class="QWidget" name="centralwidget"> | ||
| 19 | - <property name="styleSheet"> | ||
| 20 | - <string notr="true"/> | ||
| 21 | - </property> | ||
| 22 | - <widget class="QStackedWidget" name="upperStack"> | ||
| 23 | - <property name="geometry"> | ||
| 24 | - <rect> | ||
| 25 | - <x>0</x> | ||
| 26 | - <y>0</y> | ||
| 27 | - <width>900</width> | ||
| 28 | - <height>426</height> | ||
| 29 | - </rect> | ||
| 30 | - </property> | ||
| 31 | - <widget class="QWidget" name="clockContainer"> | ||
| 32 | - <property name="styleSheet"> | ||
| 33 | - <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | ||
| 34 | - </property> | ||
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 54 | - </widget> | ||
| 55 | - <widget class="DemoIcon" name="label_2"> | ||
| 56 | - <property name="geometry"> | ||
| 57 | - <rect> | ||
| 58 | - <x>780</x> | ||
| 59 | - <y>230</y> | ||
| 60 | - <width>101</width> | ||
| 61 | - <height>90</height> | ||
| 62 | - </rect> | ||
| 63 | - </property> | ||
| 64 | - </widget> | ||
| 65 | - <widget class="HalfEnergyIcon" name="label_3"> | ||
| 66 | - <property name="geometry"> | ||
| 67 | - <rect> | ||
| 68 | - <x>780</x> | ||
| 69 | - <y>160</y> | ||
| 70 | - <width>108</width> | ||
| 71 | - <height>67</height> | ||
| 72 | - </rect> | ||
| 73 | - </property> | ||
| 74 | - </widget> | ||
| 75 | - <widget class="DigitalClock" name="label_4"> | ||
| 76 | - <property name="geometry"> | ||
| 77 | - <rect> | ||
| 78 | - <x>20</x> | ||
| 79 | - <y>310</y> | ||
| 80 | - <width>300</width> | ||
| 81 | - <height>100</height> | ||
| 82 | - </rect> | ||
| 83 | - </property> | ||
| 84 | - <property name="alignment"> | ||
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - </widget> | ||
| 89 | - <widget class="QWidget" name="page_2"/> | ||
| 90 | - </widget> | ||
| 91 | - <widget class="QLabel" name="label_15"> | ||
| 92 | - <property name="geometry"> | ||
| 93 | - <rect> | ||
| 94 | - <x>55</x> | ||
| 95 | - <y>426</y> | ||
| 96 | - <width>900</width> | ||
| 97 | - <height>84</height> | ||
| 98 | - </rect> | ||
| 99 | - </property> | ||
| 100 | - <property name="font"> | ||
| 101 | - <font> | ||
| 102 | - <family>Malgun Gothic</family> | ||
| 103 | - <pointsize>11</pointsize> | ||
| 104 | - </font> | ||
| 105 | - </property> | ||
| 106 | - <property name="styleSheet"> | ||
| 107 | - <string notr="true">color: rgb(255, 255, 255);</string> | ||
| 108 | - </property> | ||
| 109 | - <property name="text"> | ||
| 110 | - <string>서비스단계(엔지니어모드) > 기본설정</string> | ||
| 111 | - </property> | ||
| 112 | - </widget> | ||
| 113 | - <widget class="QWidget" name="bottomBar" native="true"> | ||
| 114 | - <property name="geometry"> | ||
| 115 | - <rect> | ||
| 116 | - <x>0</x> | ||
| 117 | - <y>1450</y> | ||
| 118 | - <width>900</width> | ||
| 119 | - <height>150</height> | ||
| 120 | - </rect> | ||
| 121 | - </property> | ||
| 122 | - <widget class="QPushButton" name="backButton"> | ||
| 123 | - <property name="geometry"> | ||
| 124 | - <rect> | ||
| 125 | - <x>401</x> | ||
| 126 | - <y>26</y> | ||
| 127 | - <width>97</width> | ||
| 128 | - <height>97</height> | ||
| 129 | - </rect> | ||
| 130 | - </property> | ||
| 131 | - <property name="sizePolicy"> | ||
| 132 | - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 133 | - <horstretch>0</horstretch> | ||
| 134 | - <verstretch>0</verstretch> | ||
| 135 | - </sizepolicy> | ||
| 136 | - </property> | ||
| 137 | - <property name="styleSheet"> | ||
| 138 | - <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | ||
| 139 | -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | ||
| 140 | - </property> | ||
| 141 | - <property name="text"> | ||
| 142 | - <string/> | ||
| 143 | - </property> | ||
| 144 | - </widget> | ||
| 145 | - </widget> | ||
| 146 | - <widget class="QWidget" name="gridLayoutWidget"> | ||
| 147 | - <property name="geometry"> | ||
| 148 | - <rect> | ||
| 149 | - <x>40</x> | ||
| 150 | - <y>545</y> | ||
| 151 | - <width>821</width> | ||
| 152 | - <height>66</height> | ||
| 153 | - </rect> | ||
| 154 | - </property> | ||
| 155 | - <layout class="QGridLayout" name="gridLayout" columnstretch="67,33"> | ||
| 156 | - <property name="spacing"> | ||
| 157 | - <number>0</number> | ||
| 158 | - </property> | ||
| 159 | - <item row="0" column="0" colspan="2"> | ||
| 160 | - <widget class="QPushButton" name="button"> | ||
| 161 | - <property name="enabled"> | ||
| 162 | - <bool>false</bool> | ||
| 163 | - </property> | ||
| 164 | - <property name="sizePolicy"> | ||
| 165 | - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
| 166 | - <horstretch>0</horstretch> | ||
| 167 | - <verstretch>0</verstretch> | ||
| 168 | - </sizepolicy> | ||
| 169 | - </property> | ||
| 170 | - <property name="font"> | ||
| 171 | - <font> | ||
| 172 | - <family>Roboto</family> | ||
| 173 | - <pointsize>10</pointsize> | ||
| 174 | - <weight>75</weight> | ||
| 175 | - <bold>true</bold> | ||
| 176 | - <underline>false</underline> | ||
| 177 | - </font> | ||
| 178 | - </property> | ||
| 179 | - <property name="styleSheet"> | ||
| 180 | - <string notr="true">QPushButton { border-image: url(:/images/config/pannel.png);color: rgb(255, 255, 255); } | ||
| 181 | -QPushButton:pressed { border-image: url(:/images/config/pannel_ov.png); } | ||
| 182 | -QPushButton { text-align: left;} | ||
| 183 | -</string> | ||
| 184 | - </property> | ||
| 185 | - <property name="text"> | ||
| 186 | - <string> 기본설정</string> | ||
| 187 | - </property> | ||
| 188 | - </widget> | ||
| 189 | - </item> | ||
| 190 | - <item row="0" column="1"> | ||
| 191 | - <widget class="QLabel" name="label_17"> | ||
| 192 | - <property name="enabled"> | ||
| 193 | - <bool>true</bool> | ||
| 194 | - </property> | ||
| 195 | - <property name="font"> | ||
| 196 | - <font> | ||
| 197 | - <family>Malgun Gothic</family> | ||
| 198 | - <pointsize>11</pointsize> | ||
| 199 | - <weight>75</weight> | ||
| 200 | - <bold>true</bold> | ||
| 201 | - </font> | ||
| 202 | - </property> | ||
| 203 | - <property name="styleSheet"> | ||
| 204 | - <string notr="true">color: rgb(255, 255, 255);</string> | ||
| 205 | - </property> | ||
| 206 | - <property name="text"> | ||
| 207 | - <string>EM-2</string> | ||
| 208 | - </property> | ||
| 209 | - <property name="alignment"> | ||
| 210 | - <set>Qt::AlignCenter</set> | ||
| 211 | - </property> | ||
| 212 | - <property name="margin"> | ||
| 213 | - <number>0</number> | ||
| 214 | - </property> | ||
| 215 | - </widget> | ||
| 216 | - </item> | ||
| 217 | - </layout> | ||
| 218 | - </widget> | ||
| 219 | - <widget class="QWidget" name="midWidget" native="true"> | ||
| 220 | - <property name="geometry"> | ||
| 221 | - <rect> | ||
| 222 | - <x>43</x> | ||
| 223 | - <y>627</y> | ||
| 224 | - <width>813</width> | ||
| 225 | - <height>647</height> | ||
| 226 | - </rect> | ||
| 227 | - </property> | ||
| 228 | - <property name="styleSheet"> | ||
| 229 | - <string notr="true">QLabel{ | ||
| 230 | - color : white; | ||
| 231 | -}</string> | ||
| 232 | - </property> | ||
| 233 | - <widget class="QLabel" name="ctrlLbList_1_1"> | ||
| 234 | - <property name="geometry"> | ||
| 235 | - <rect> | ||
| 236 | - <x>0</x> | ||
| 237 | - <y>70</y> | ||
| 238 | - <width>460</width> | ||
| 239 | - <height>94</height> | ||
| 240 | - </rect> | ||
| 241 | - </property> | ||
| 242 | - <property name="font"> | ||
| 243 | - <font> | ||
| 244 | - <family>나눔고딕</family> | ||
| 245 | - <pointsize>10</pointsize> | ||
| 246 | - </font> | ||
| 247 | - </property> | ||
| 248 | - <property name="text"> | ||
| 249 | - <string>스팀발생기 수동 스케일 제거 후 물의 양</string> | ||
| 250 | - </property> | ||
| 251 | - <property name="margin"> | ||
| 252 | - <number>7</number> | ||
| 253 | - </property> | ||
| 254 | - </widget> | ||
| 255 | - <widget class="QLabel" name="ctrlLbList_1_2"> | ||
| 256 | - <property name="geometry"> | ||
| 257 | - <rect> | ||
| 258 | - <x>0</x> | ||
| 259 | - <y>166</y> | ||
| 260 | - <width>460</width> | ||
| 261 | - <height>94</height> | ||
| 262 | - </rect> | ||
| 263 | - </property> | ||
| 264 | - <property name="font"> | ||
| 265 | - <font> | ||
| 266 | - <family>나눔고딕</family> | ||
| 267 | - <pointsize>10</pointsize> | ||
| 268 | - </font> | ||
| 269 | - </property> | ||
| 270 | - <property name="text"> | ||
| 271 | - <string>소형펌프모터 모드</string> | ||
| 272 | - </property> | ||
| 273 | - <property name="margin"> | ||
| 274 | - <number>7</number> | ||
| 275 | - </property> | ||
| 276 | - </widget> | ||
| 277 | - <widget class="QLabel" name="ctrlLbList_1_3"> | ||
| 278 | - <property name="geometry"> | ||
| 279 | - <rect> | ||
| 280 | - <x>0</x> | ||
| 281 | - <y>263</y> | ||
| 282 | - <width>460</width> | ||
| 283 | - <height>94</height> | ||
| 284 | - </rect> | ||
| 285 | - </property> | ||
| 286 | - <property name="font"> | ||
| 287 | - <font> | ||
| 288 | - <family>나눔고딕</family> | ||
| 289 | - <pointsize>10</pointsize> | ||
| 290 | - </font> | ||
| 291 | - </property> | ||
| 292 | - <property name="text"> | ||
| 293 | - <string>소형펌프모터 인터벌시간 설정</string> | ||
| 294 | - </property> | ||
| 295 | - <property name="margin"> | ||
| 296 | - <number>7</number> | ||
| 297 | - </property> | ||
| 298 | - </widget> | ||
| 299 | - <widget class="QLabel" name="ctrlLbList_1_4"> | ||
| 300 | - <property name="geometry"> | ||
| 301 | - <rect> | ||
| 302 | - <x>0</x> | ||
| 303 | - <y>360</y> | ||
| 304 | - <width>460</width> | ||
| 305 | - <height>94</height> | ||
| 306 | - </rect> | ||
| 307 | - </property> | ||
| 308 | - <property name="font"> | ||
| 309 | - <font> | ||
| 310 | - <family>나눔고딕</family> | ||
| 311 | - <pointsize>10</pointsize> | ||
| 312 | - </font> | ||
| 313 | - </property> | ||
| 314 | - <property name="text"> | ||
| 315 | - <string>건열퀀칭 작동 온도</string> | ||
| 316 | - </property> | ||
| 317 | - <property name="margin"> | ||
| 318 | - <number>7</number> | ||
| 319 | - </property> | ||
| 320 | - </widget> | ||
| 321 | - <widget class="QLabel" name="ctrlLbList_1_5"> | ||
| 322 | - <property name="geometry"> | ||
| 323 | - <rect> | ||
| 324 | - <x>0</x> | ||
| 325 | - <y>458</y> | ||
| 326 | - <width>460</width> | ||
| 327 | - <height>94</height> | ||
| 328 | - </rect> | ||
| 329 | - </property> | ||
| 330 | - <property name="font"> | ||
| 331 | - <font> | ||
| 332 | - <family>나눔고딕</family> | ||
| 333 | - <pointsize>10</pointsize> | ||
| 334 | - </font> | ||
| 335 | - </property> | ||
| 336 | - <property name="text"> | ||
| 337 | - <string>스팀퀀칭 작동 온도</string> | ||
| 338 | - </property> | ||
| 339 | - <property name="margin"> | ||
| 340 | - <number>7</number> | ||
| 341 | - </property> | ||
| 342 | - </widget> | ||
| 343 | - <widget class="QLabel" name="ctrlLbList_1_6"> | ||
| 344 | - <property name="geometry"> | ||
| 345 | - <rect> | ||
| 346 | - <x>0</x> | ||
| 347 | - <y>553</y> | ||
| 348 | - <width>460</width> | ||
| 349 | - <height>94</height> | ||
| 350 | - </rect> | ||
| 351 | - </property> | ||
| 352 | - <property name="font"> | ||
| 353 | - <font> | ||
| 354 | - <family>나눔고딕</family> | ||
| 355 | - <pointsize>10</pointsize> | ||
| 356 | - </font> | ||
| 357 | - </property> | ||
| 358 | - <property name="text"> | ||
| 359 | - <string>드레인볼밸브 </string> | ||
| 360 | - </property> | ||
| 361 | - <property name="margin"> | ||
| 362 | - <number>7</number> | ||
| 363 | - </property> | ||
| 364 | - </widget> | ||
| 365 | - <widget class="QLabel" name="ctrlLbCol_1"> | ||
| 366 | - <property name="geometry"> | ||
| 367 | - <rect> | ||
| 368 | - <x>0</x> | ||
| 369 | - <y>0</y> | ||
| 370 | - <width>460</width> | ||
| 371 | - <height>69</height> | ||
| 372 | - </rect> | ||
| 373 | - </property> | ||
| 374 | - <property name="font"> | ||
| 375 | - <font> | ||
| 376 | - <family>나눔고딕</family> | ||
| 377 | - <pointsize>10</pointsize> | ||
| 378 | - </font> | ||
| 379 | - </property> | ||
| 380 | - <property name="text"> | ||
| 381 | - <string>설정구분</string> | ||
| 382 | - </property> | ||
| 383 | - <property name="margin"> | ||
| 384 | - <number>7</number> | ||
| 385 | - </property> | ||
| 386 | - </widget> | ||
| 387 | - <widget class="QLabel" name="ctrlLbCol_2"> | ||
| 388 | - <property name="geometry"> | ||
| 389 | - <rect> | ||
| 390 | - <x>460</x> | ||
| 391 | - <y>0</y> | ||
| 392 | - <width>201</width> | ||
| 393 | - <height>69</height> | ||
| 394 | - </rect> | ||
| 395 | - </property> | ||
| 396 | - <property name="font"> | ||
| 397 | - <font> | ||
| 398 | - <family>나눔고딕</family> | ||
| 399 | - <pointsize>10</pointsize> | ||
| 400 | - </font> | ||
| 401 | - </property> | ||
| 402 | - <property name="text"> | ||
| 403 | - <string>설 정</string> | ||
| 404 | - </property> | ||
| 405 | - <property name="alignment"> | ||
| 406 | - <set>Qt::AlignCenter</set> | ||
| 407 | - </property> | ||
| 408 | - <property name="margin"> | ||
| 409 | - <number>7</number> | ||
| 410 | - </property> | ||
| 411 | - </widget> | ||
| 412 | - <widget class="QLabel" name="ctrlLbCol_3"> | ||
| 413 | - <property name="geometry"> | ||
| 414 | - <rect> | ||
| 415 | - <x>660</x> | ||
| 416 | - <y>0</y> | ||
| 417 | - <width>151</width> | ||
| 418 | - <height>69</height> | ||
| 419 | - </rect> | ||
| 420 | - </property> | ||
| 421 | - <property name="font"> | ||
| 422 | - <font> | ||
| 423 | - <family>나눔고딕</family> | ||
| 424 | - <pointsize>10</pointsize> | ||
| 425 | - </font> | ||
| 426 | - </property> | ||
| 427 | - <property name="text"> | ||
| 428 | - <string>상태</string> | ||
| 429 | - </property> | ||
| 430 | - <property name="alignment"> | ||
| 431 | - <set>Qt::AlignCenter</set> | ||
| 432 | - </property> | ||
| 433 | - <property name="margin"> | ||
| 434 | - <number>7</number> | ||
| 435 | - </property> | ||
| 436 | - </widget> | ||
| 437 | - </widget> | ||
| 438 | - </widget> | ||
| 439 | - </widget> | ||
| 440 | - <customwidgets> | ||
| 441 | - <customwidget> | ||
| 442 | - <class>Clock</class> | ||
| 443 | - <extends>QWidget</extends> | ||
| 444 | - <header>clock.h</header> | ||
| 445 | - <container>1</container> | ||
| 446 | - </customwidget> | ||
| 447 | - <customwidget> | ||
| 448 | - <class>WashWarnIcon</class> | ||
| 449 | - <extends>QLabel</extends> | ||
| 450 | - <header>washwarnicon.h</header> | ||
| 451 | - </customwidget> | ||
| 452 | - <customwidget> | ||
| 453 | - <class>DemoIcon</class> | ||
| 454 | - <extends>QLabel</extends> | ||
| 455 | - <header>demoicon.h</header> | ||
| 456 | - </customwidget> | ||
| 457 | - <customwidget> | ||
| 458 | - <class>HalfEnergyIcon</class> | ||
| 459 | - <extends>QLabel</extends> | ||
| 460 | - <header>halfenergyicon.h</header> | ||
| 461 | - </customwidget> | ||
| 462 | - <customwidget> | ||
| 463 | - <class>DigitalClock</class> | ||
| 464 | - <extends>QLabel</extends> | ||
| 465 | - <header>digitalclock.h</header> | ||
| 466 | - </customwidget> | ||
| 467 | - </customwidgets> | ||
| 468 | - <resources/> | ||
| 469 | - <connections/> | ||
| 470 | -</ui> |
app/gui/oven_control/config.cpp
| @@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
| 3 | #include <QFile> | 3 | #include <QFile> |
| 4 | #include <QIODevice> | 4 | #include <QIODevice> |
| 5 | #include <QApplication> | 5 | #include <QApplication> |
| 6 | +#include <QProcess> | ||
| 6 | #include "config.h" | 7 | #include "config.h" |
| 7 | #include "configdatetimedlg.h" | 8 | #include "configdatetimedlg.h" |
| 8 | #include "configlanguagedlg.h" | 9 | #include "configlanguagedlg.h" |
| @@ -466,6 +467,20 @@ void Config::applyCurrentConfigLanguage() | @@ -466,6 +467,20 @@ void Config::applyCurrentConfigLanguage() | ||
| 466 | } | 467 | } |
| 467 | } | 468 | } |
| 468 | 469 | ||
| 470 | +void Config::allProgramInit() | ||
| 471 | +{ | ||
| 472 | + QProcess process(this); | ||
| 473 | + QStringList args; | ||
| 474 | + process.start("sh -c \"rm -rf /prime/*\""); | ||
| 475 | + if(process.waitForFinished(30000)==true){ | ||
| 476 | + qDebug()<< "All Program Delete Success:"; | ||
| 477 | + sync(); | ||
| 478 | + QProcess reboot; | ||
| 479 | + reboot.start("reboot"); | ||
| 480 | + reboot.waitForFinished(); | ||
| 481 | + } | ||
| 482 | +} | ||
| 483 | + | ||
| 469 | void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ | 484 | void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ |
| 470 | QDialog *dlg; | 485 | QDialog *dlg; |
| 471 | QString usbPath = ""; | 486 | QString usbPath = ""; |
| @@ -562,6 +577,7 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ | @@ -562,6 +577,7 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ | ||
| 562 | qDebug() << "Process Sound Config Reset"; | 577 | qDebug() << "Process Sound Config Reset"; |
| 563 | } | 578 | } |
| 564 | else if(idx==config_program_initialize){ | 579 | else if(idx==config_program_initialize){ |
| 580 | + allProgramInit(); | ||
| 565 | qDebug() << "All Program Reset"; | 581 | qDebug() << "All Program Reset"; |
| 566 | } | 582 | } |
| 567 | } | 583 | } |
app/gui/oven_control/config.h
| @@ -446,6 +446,7 @@ public: | @@ -446,6 +446,7 @@ public: | ||
| 446 | void removeFavorite(Define::ConfigType idx); | 446 | void removeFavorite(Define::ConfigType idx); |
| 447 | QString getProductSerial(); | 447 | QString getProductSerial(); |
| 448 | void applyCurrentConfigLanguage(); | 448 | void applyCurrentConfigLanguage(); |
| 449 | + void allProgramInit(void); | ||
| 449 | 450 | ||
| 450 | 451 | ||
| 451 | 452 |
app/gui/oven_control/configwindow.cpp
| @@ -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/define.h
app/gui/oven_control/fileprocessdlg.cpp
| 1 | #include <QTimer> | 1 | #include <QTimer> |
| 2 | #include <unistd.h> | 2 | #include <unistd.h> |
| 3 | +#include <QProcess> | ||
| 3 | #include "fileprocessdlg.h" | 4 | #include "fileprocessdlg.h" |
| 4 | #include "ui_fileprocessdlg.h" | 5 | #include "ui_fileprocessdlg.h" |
| 5 | #include "fileprocessor.h" | 6 | #include "fileprocessor.h" |
| @@ -37,6 +38,7 @@ void ProgramCopyWorker::workerMain(){ | @@ -37,6 +38,7 @@ void ProgramCopyWorker::workerMain(){ | ||
| 37 | QStringList strdirlist; | 38 | QStringList strdirlist; |
| 38 | QString srcFilepath; | 39 | QString srcFilepath; |
| 39 | QString destFilePath; | 40 | QString destFilePath; |
| 41 | + bool bRst=true; | ||
| 40 | 42 | ||
| 41 | //make destination folder | 43 | //make destination folder |
| 42 | QDir destdir(m_strDestDir); | 44 | QDir destdir(m_strDestDir); |
| @@ -58,8 +60,11 @@ void ProgramCopyWorker::workerMain(){ | @@ -58,8 +60,11 @@ void ProgramCopyWorker::workerMain(){ | ||
| 58 | } | 60 | } |
| 59 | qDebug() << " Dir List info : count = " << m_arrSrcFileList.size() << ", File Total Size = " << nTotalFileSize; | 61 | qDebug() << " Dir List info : count = " << m_arrSrcFileList.size() << ", File Total Size = " << nTotalFileSize; |
| 60 | if(nTotalFileSize <=0 ){ | 62 | if(nTotalFileSize <=0 ){ |
| 63 | + emit errorFired("SIZE ERROR "); | ||
| 64 | + QThread::currentThread()->msleep(1000); | ||
| 65 | + bRst = false; | ||
| 66 | + emit progressed(0,0); | ||
| 61 | emit finished(); | 67 | emit finished(); |
| 62 | - progressed(0,0); | ||
| 63 | return; | 68 | return; |
| 64 | } | 69 | } |
| 65 | 70 | ||
| @@ -75,7 +80,13 @@ void ProgramCopyWorker::workerMain(){ | @@ -75,7 +80,13 @@ void ProgramCopyWorker::workerMain(){ | ||
| 75 | if(QFile::exists(destFilePath)){ | 80 | if(QFile::exists(destFilePath)){ |
| 76 | QFile::rename(destFilePath, QString("%1.bak").arg(destFilePath)); | 81 | QFile::rename(destFilePath, QString("%1.bak").arg(destFilePath)); |
| 77 | } | 82 | } |
| 78 | - QFile::copy(srcFilepath,destFilePath); | 83 | + if(QFile::copy(srcFilepath,destFilePath)==false){ |
| 84 | + qDebug() << srcFilepath << " file copy fail!"; | ||
| 85 | + bRst = false; | ||
| 86 | + emit errorFired(finfo.fileName()); | ||
| 87 | + QThread::currentThread()->msleep(5000); | ||
| 88 | + break; | ||
| 89 | + } | ||
| 79 | nCpyFileSize += finfo.size(); | 90 | nCpyFileSize += finfo.size(); |
| 80 | nCurProgress = (nCpyFileSize *100) / nTotalFileSize; | 91 | nCurProgress = (nCpyFileSize *100) / nTotalFileSize; |
| 81 | nRemainSec = (nTotalFileSize-nCpyFileSize)/200000; | 92 | nRemainSec = (nTotalFileSize-nCpyFileSize)/200000; |
| @@ -87,13 +98,22 @@ void ProgramCopyWorker::workerMain(){ | @@ -87,13 +98,22 @@ void ProgramCopyWorker::workerMain(){ | ||
| 87 | } | 98 | } |
| 88 | QThread::currentThread()->msleep(10); | 99 | QThread::currentThread()->msleep(10); |
| 89 | } | 100 | } |
| 101 | + | ||
| 90 | qDebug() << "File List Copy Finished"; | 102 | qDebug() << "File List Copy Finished"; |
| 91 | 103 | ||
| 92 | - if(QThread::currentThread()->isInterruptionRequested() == false){ | 104 | + if(QThread::currentThread()->isInterruptionRequested() == false || bRst == false){ |
| 93 | foreach(QString srcpath, m_arrSrcDirList){ | 105 | foreach(QString srcpath, m_arrSrcDirList){ |
| 94 | qDebug() << "src dir : " << srcpath; | 106 | qDebug() << "src dir : " << srcpath; |
| 95 | 107 | ||
| 96 | QDir srcdir(srcpath); | 108 | QDir srcdir(srcpath); |
| 109 | + if(srcdir.exists() == false){ | ||
| 110 | + qDebug() << "Source Dir is not exist"; | ||
| 111 | + bRst = false; | ||
| 112 | + emit errorFired("DIR not exist"); | ||
| 113 | + QThread::currentThread()->msleep(5000); | ||
| 114 | + break; | ||
| 115 | + } | ||
| 116 | + | ||
| 97 | strdirlist.append(srcpath); | 117 | strdirlist.append(srcpath); |
| 98 | FileProcessor::getAllDirList(srcdir, strdirlist); | 118 | FileProcessor::getAllDirList(srcdir, strdirlist); |
| 99 | qDebug() << "dir size : " <<strdirlist.size(); | 119 | qDebug() << "dir size : " <<strdirlist.size(); |
| @@ -115,7 +135,11 @@ void ProgramCopyWorker::workerMain(){ | @@ -115,7 +135,11 @@ void ProgramCopyWorker::workerMain(){ | ||
| 115 | srcFilepath = finfo.absoluteFilePath(); | 135 | srcFilepath = finfo.absoluteFilePath(); |
| 116 | destFilePath = QString("%1/%2").arg(QString(strDir).replace(srcpath,targetpath)).arg(finfo.fileName()); | 136 | destFilePath = QString("%1/%2").arg(QString(strDir).replace(srcpath,targetpath)).arg(finfo.fileName()); |
| 117 | if(QFile::copy(srcFilepath, destFilePath)==false){ | 137 | if(QFile::copy(srcFilepath, destFilePath)==false){ |
| 118 | - qDebug() << srcFilepath << " file copy fail! dest file path info is " << destFilePath; | 138 | + bRst = false; |
| 139 | + emit errorFired(finfo.fileName()); | ||
| 140 | + qDebug() << srcFilepath << " file copy fail!"; | ||
| 141 | + QThread::currentThread()->msleep(5000); | ||
| 142 | + break; | ||
| 119 | } | 143 | } |
| 120 | nCpyFileSize += finfo.size(); | 144 | nCpyFileSize += finfo.size(); |
| 121 | nCurProgress = (nCpyFileSize *100) / nTotalFileSize; | 145 | nCurProgress = (nCpyFileSize *100) / nTotalFileSize; |
| @@ -129,7 +153,7 @@ void ProgramCopyWorker::workerMain(){ | @@ -129,7 +153,7 @@ void ProgramCopyWorker::workerMain(){ | ||
| 129 | } | 153 | } |
| 130 | //QThread::currentThread()->msleep(100); | 154 | //QThread::currentThread()->msleep(100); |
| 131 | } | 155 | } |
| 132 | - if(QThread::currentThread()->isInterruptionRequested()) break; | 156 | + if(QThread::currentThread()->isInterruptionRequested() || bRst == false) break; |
| 133 | } | 157 | } |
| 134 | strdirlist.clear(); | 158 | strdirlist.clear(); |
| 135 | if(QThread::currentThread()->isInterruptionRequested()) break; | 159 | if(QThread::currentThread()->isInterruptionRequested()) break; |
| @@ -137,7 +161,7 @@ void ProgramCopyWorker::workerMain(){ | @@ -137,7 +161,7 @@ void ProgramCopyWorker::workerMain(){ | ||
| 137 | } | 161 | } |
| 138 | qDebug() << "File Copy Complete! SRC File Size = " << nTotalFileSize << "DEST File Size = " << nCpyFileSize; | 162 | qDebug() << "File Copy Complete! SRC File Size = " << nTotalFileSize << "DEST File Size = " << nCpyFileSize; |
| 139 | 163 | ||
| 140 | - if(QThread::currentThread()->isInterruptionRequested()){ | 164 | + if(QThread::currentThread()->isInterruptionRequested() || bRst == false){ |
| 141 | foreach(QString strinfo, m_arrSrcFileList){ | 165 | foreach(QString strinfo, m_arrSrcFileList){ |
| 142 | QString filepath = strinfo.left(strinfo.indexOf(',',0)+1); | 166 | QString filepath = strinfo.left(strinfo.indexOf(',',0)+1); |
| 143 | QString destfiledir = strinfo.right(strinfo.size() - (strinfo.indexOf(',',0)+1)); | 167 | QString destfiledir = strinfo.right(strinfo.size() - (strinfo.indexOf(',',0)+1)); |
| @@ -231,6 +255,9 @@ FileProcessDlg::FileProcessDlg(QWidget *parent, ConfigType type, bool isDown) : | @@ -231,6 +255,9 @@ FileProcessDlg::FileProcessDlg(QWidget *parent, ConfigType type, bool isDown) : | ||
| 231 | this->setFocus(); | 255 | this->setFocus(); |
| 232 | ui->ctrBtnCancel->setFocus(); | 256 | ui->ctrBtnCancel->setFocus(); |
| 233 | 257 | ||
| 258 | + m_bRst = true; | ||
| 259 | + m_nCfgtype = type; | ||
| 260 | + | ||
| 234 | ui->ctrWjProcess->setMinimum(0); | 261 | ui->ctrWjProcess->setMinimum(0); |
| 235 | ui->ctrWjProcess->setMaximum(100); | 262 | ui->ctrWjProcess->setMaximum(100); |
| 236 | 263 | ||
| @@ -540,11 +567,13 @@ void FileProcessDlg::programDownload(){ | @@ -540,11 +567,13 @@ void FileProcessDlg::programDownload(){ | ||
| 540 | 567 | ||
| 541 | if(FileProcessor::detectUSB(strDescPath)){ | 568 | if(FileProcessor::detectUSB(strDescPath)){ |
| 542 | worker.setDestPath(QString("%1/prime").arg(strDescPath)); | 569 | worker.setDestPath(QString("%1/prime").arg(strDescPath)); |
| 543 | - worker.addSrcDir("/prime/cookbook"); | 570 | + worker.addSrcDir("/prime/history"); |
| 571 | + worker.addSrcDir("/prime/program"); | ||
| 544 | worker.moveToThread(&programCopyThd); | 572 | worker.moveToThread(&programCopyThd); |
| 545 | 573 | ||
| 546 | connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain())); | 574 | connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain())); |
| 547 | connect(&worker, SIGNAL(progressed(int,int)), this, SLOT(onProgressed(int,int))); | 575 | connect(&worker, SIGNAL(progressed(int,int)), this, SLOT(onProgressed(int,int))); |
| 576 | + connect(&worker, SIGNAL(errorFired(QString)), this, SLOT(onErrorFired(QString))); | ||
| 548 | connect(this, SIGNAL(stopcopy()), &worker, SLOT(workerStop())); | 577 | connect(this, SIGNAL(stopcopy()), &worker, SLOT(workerStop())); |
| 549 | connect(&worker, SIGNAL(finished()), &programCopyThd,SLOT(quit())); | 578 | connect(&worker, SIGNAL(finished()), &programCopyThd,SLOT(quit())); |
| 550 | connect(&programCopyThd, SIGNAL(finished()), this, SLOT(onProgressFinished())); | 579 | connect(&programCopyThd, SIGNAL(finished()), this, SLOT(onProgressFinished())); |
| @@ -560,10 +589,75 @@ void FileProcessDlg::programDownload(){ | @@ -560,10 +589,75 @@ void FileProcessDlg::programDownload(){ | ||
| 560 | } | 589 | } |
| 561 | 590 | ||
| 562 | void FileProcessDlg::onProgressFinished(){ | 591 | void FileProcessDlg::onProgressFinished(){ |
| 592 | + QString strDescPath; | ||
| 593 | + QString strZipCmd; | ||
| 594 | + m_bRst = true; | ||
| 595 | + QProcess process; | ||
| 596 | + | ||
| 597 | + FileProcessor::detectUSB(strDescPath); | ||
| 598 | + | ||
| 599 | + strZipCmd = QString("sh -c \"unzip -P 1234 %1/prime/prime.zip -d /prime\"").arg(strDescPath); | ||
| 600 | + QFileInfo info(QString("%1/prime/prime.zip").arg(strDescPath)); | ||
| 601 | + | ||
| 602 | + | ||
| 603 | + QDir cookbooksrc("/prime/cookbook"); | ||
| 604 | + QDir cookBookback("/prime/cookbook_back"); | ||
| 605 | + QDir multibooksrc("/prime/multi"); | ||
| 606 | + QDir multibookback("/prime/multi_back"); | ||
| 607 | + | ||
| 608 | + qDebug() << info.absoluteFilePath(); | ||
| 609 | + | ||
| 610 | + if(m_nCfgtype == config_program_upload && m_bRst && info.exists()==true){ | ||
| 611 | + if(cookbooksrc.exists()){ | ||
| 612 | + if(cookBookback.exists()){ | ||
| 613 | + process.start("sh -c \"rm -r /prime/cookbook_back\""); | ||
| 614 | + process.waitForFinished(); | ||
| 615 | + process.start("sync"); | ||
| 616 | + process.waitForFinished(); | ||
| 617 | + } | ||
| 618 | + qDebug() << "cook book exists"; | ||
| 619 | + process.start("sh -c \"mv /prime/cookbook /prime/cookbook_back\""); | ||
| 620 | + process.waitForFinished(); | ||
| 621 | + process.start("sync"); | ||
| 622 | + process.waitForFinished(); | ||
| 623 | + } | ||
| 624 | + | ||
| 625 | + if(multibooksrc.exists()){ | ||
| 626 | + if(multibookback.exists()){ | ||
| 627 | + process.start("sh -c \"rm -r /prime/multi_back\""); | ||
| 628 | + process.waitForFinished(); | ||
| 629 | + process.start("sync"); | ||
| 630 | + process.waitForFinished(); | ||
| 631 | + } | ||
| 632 | + qDebug() << "multi book exists"; | ||
| 633 | + process.start("sh -c \"mv /prime/multi /prime/multi_back\""); | ||
| 634 | + process.waitForFinished(); | ||
| 635 | + process.start("sync"); | ||
| 636 | + process.waitForFinished(); | ||
| 637 | + } | ||
| 638 | + | ||
| 639 | + qDebug() << "cook book upload"; | ||
| 640 | + qDebug() << QTime::currentTime(); | ||
| 641 | + | ||
| 642 | + process.start(strZipCmd); | ||
| 643 | + if(process.waitForFinished(120000)==false){ | ||
| 644 | + ui->ctrLbRemainTime->setText("Cook book copy fail"); | ||
| 645 | + } | ||
| 646 | + process.start("sync"); | ||
| 647 | + process.waitForFinished(); | ||
| 648 | + qDebug() << QTime::currentTime(); | ||
| 649 | + } | ||
| 563 | ui->ctrLbRemainTime->setText(tr("완료")); | 650 | ui->ctrLbRemainTime->setText(tr("완료")); |
| 564 | QTimer::singleShot(1000,this, SLOT(close())); | 651 | QTimer::singleShot(1000,this, SLOT(close())); |
| 565 | } | 652 | } |
| 566 | 653 | ||
| 654 | +void FileProcessDlg::onErrorFired(QString Desc) | ||
| 655 | +{ | ||
| 656 | + m_bRst = false; | ||
| 657 | + ui->ctrLbRemainTime->setText(QString("%1 %2").arg(Desc).arg(tr("에러 발생으로 종료합니다."))); | ||
| 658 | + //QTimer::singleShot(1000,this, SLOT(close())); | ||
| 659 | +} | ||
| 660 | + | ||
| 567 | void FileProcessDlg::onProgressed(int progress, int sec){ | 661 | void FileProcessDlg::onProgressed(int progress, int sec){ |
| 568 | int min, _sec; | 662 | int min, _sec; |
| 569 | QString strTemp; | 663 | QString strTemp; |
| @@ -584,6 +678,9 @@ void FileProcessDlg::programUpload(){ | @@ -584,6 +678,9 @@ void FileProcessDlg::programUpload(){ | ||
| 584 | QString strDescPath; | 678 | QString strDescPath; |
| 585 | QString strSrcPath; | 679 | QString strSrcPath; |
| 586 | 680 | ||
| 681 | + | ||
| 682 | + | ||
| 683 | + | ||
| 587 | if(FileProcessor::detectUSB(strSrcPath)){ | 684 | if(FileProcessor::detectUSB(strSrcPath)){ |
| 588 | worker.addSrcFile(QString("%1/prime/superdaemon,/prime").arg(strSrcPath)); | 685 | worker.addSrcFile(QString("%1/prime/superdaemon,/prime").arg(strSrcPath)); |
| 589 | worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath)); | 686 | worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath)); |
| @@ -595,13 +692,14 @@ void FileProcessDlg::programUpload(){ | @@ -595,13 +692,14 @@ void FileProcessDlg::programUpload(){ | ||
| 595 | worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath)); | 692 | worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath)); |
| 596 | worker.addSrcFile(QString("%1/prime/superdaemon.md5,/prime").arg(strSrcPath)); | 693 | worker.addSrcFile(QString("%1/prime/superdaemon.md5,/prime").arg(strSrcPath)); |
| 597 | worker.setDestPath("/prime"); | 694 | worker.setDestPath("/prime"); |
| 598 | - worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/cookbook")); | 695 | + //worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/cookbook")); //쿡북 복사 삭제 |
| 599 | worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/templates")); | 696 | worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/templates")); |
| 600 | worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/sounds")); | 697 | worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/sounds")); |
| 601 | worker.moveToThread(&programCopyThd); | 698 | worker.moveToThread(&programCopyThd); |
| 602 | 699 | ||
| 603 | connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain())); | 700 | connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain())); |
| 604 | connect(&worker, SIGNAL(progressed(int,int)), this, SLOT(onProgressed(int,int))); | 701 | connect(&worker, SIGNAL(progressed(int,int)), this, SLOT(onProgressed(int,int))); |
| 702 | + connect(&worker,SIGNAL(errorFired(QString)),this,SLOT(onErrorFired(QString))); | ||
| 605 | connect(this, SIGNAL(stopcopy()), &worker, SLOT(workerStop())); | 703 | connect(this, SIGNAL(stopcopy()), &worker, SLOT(workerStop())); |
| 606 | connect(&worker, SIGNAL(finished()), &programCopyThd,SLOT(quit())); | 704 | connect(&worker, SIGNAL(finished()), &programCopyThd,SLOT(quit())); |
| 607 | connect(&programCopyThd, SIGNAL(finished()), this, SLOT(onProgressFinished())); | 705 | connect(&programCopyThd, SIGNAL(finished()), this, SLOT(onProgressFinished())); |
app/gui/oven_control/fileprocessdlg.h
| @@ -41,6 +41,7 @@ public slots: | @@ -41,6 +41,7 @@ public slots: | ||
| 41 | signals: | 41 | signals: |
| 42 | void finished(); | 42 | void finished(); |
| 43 | void progressed(int progress, int sec); | 43 | void progressed(int progress, int sec); |
| 44 | + void errorFired(QString Desc); | ||
| 44 | }; | 45 | }; |
| 45 | 46 | ||
| 46 | class FileProcessDlg : public QDialog | 47 | class FileProcessDlg : public QDialog |
| @@ -70,6 +71,7 @@ signals: | @@ -70,6 +71,7 @@ signals: | ||
| 70 | public slots: | 71 | public slots: |
| 71 | void onProgressed(int progress,int sec); | 72 | void onProgressed(int progress,int sec); |
| 72 | void onProgressFinished(); | 73 | void onProgressFinished(); |
| 74 | + void onErrorFired(QString Desc); | ||
| 73 | 75 | ||
| 74 | protected: | 76 | protected: |
| 75 | void keyPressEvent(QKeyEvent* event); | 77 | void keyPressEvent(QKeyEvent* event); |
| @@ -80,6 +82,7 @@ private: | @@ -80,6 +82,7 @@ private: | ||
| 80 | ConfigType m_nCfgtype; | 82 | ConfigType m_nCfgtype; |
| 81 | QThread programCopyThd; | 83 | QThread programCopyThd; |
| 82 | ProgramCopyWorker worker; | 84 | ProgramCopyWorker worker; |
| 85 | + bool m_bRst; | ||
| 83 | }; | 86 | }; |
| 84 | 87 | ||
| 85 | #endif // FILEPROCESSDLG_H | 88 | #endif // FILEPROCESSDLG_H |
app/gui/oven_control/mainwindow.cpp
| @@ -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/manualcookwindow.cpp
| @@ -21,6 +21,7 @@ | @@ -21,6 +21,7 @@ | ||
| 21 | #include "primewindow.h" | 21 | #include "primewindow.h" |
| 22 | #include "washwindow.h" | 22 | #include "washwindow.h" |
| 23 | #include "errorpopupdlg.h" | 23 | #include "errorpopupdlg.h" |
| 24 | +#include "manualviewerdlg.h" | ||
| 24 | 25 | ||
| 25 | #include <QTime> | 26 | #include <QTime> |
| 26 | 27 | ||
| @@ -1149,7 +1150,9 @@ void ManualCookWindow::on_washButton_clicked() | @@ -1149,7 +1150,9 @@ void ManualCookWindow::on_washButton_clicked() | ||
| 1149 | 1150 | ||
| 1150 | void ManualCookWindow::on_helpButton_clicked() | 1151 | void ManualCookWindow::on_helpButton_clicked() |
| 1151 | { | 1152 | { |
| 1152 | - | 1153 | + ManualViewerDlg* dlg = new ManualViewerDlg(this, MANUAL_COOK_PAGE); |
| 1154 | + dlg->showFullScreen(); | ||
| 1155 | + dlg->raise(); | ||
| 1153 | } | 1156 | } |
| 1154 | 1157 | ||
| 1155 | void ManualCookWindow::on_timeSlider_valueChanged() | 1158 | void ManualCookWindow::on_timeSlider_valueChanged() |
app/gui/oven_control/manualviewerdlg.cpp
| @@ -3,22 +3,20 @@ | @@ -3,22 +3,20 @@ | ||
| 3 | #include "manualviewerdlg.h" | 3 | #include "manualviewerdlg.h" |
| 4 | #include "ui_manualviewerdlg.h" | 4 | #include "ui_manualviewerdlg.h" |
| 5 | 5 | ||
| 6 | -ManualViewerDlg::ManualViewerDlg(QWidget *parent) : | 6 | +ManualViewerDlg::ManualViewerDlg(QWidget *parent, uint32_t start) : |
| 7 | QDialog(parent), | 7 | QDialog(parent), |
| 8 | ui(new Ui::ManualViewerDlg) | 8 | ui(new Ui::ManualViewerDlg) |
| 9 | { | 9 | { |
| 10 | ui->setupUi(this); | 10 | ui->setupUi(this); |
| 11 | - ui->clockContainer->setParent(ui->upperStack); | ||
| 12 | setAttribute(Qt::WA_DeleteOnClose); | 11 | setAttribute(Qt::WA_DeleteOnClose); |
| 12 | + this->setFocus(); | ||
| 13 | 13 | ||
| 14 | + m_nCurPage = start; | ||
| 15 | + if(m_nCurPage<1 || m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1; | ||
| 14 | 16 | ||
| 15 | - ui->ctrLbManual->setScaledContents(true); | ||
| 16 | - //ui->ctrLbManual->setSizePolicy(QSizePolicy::); | ||
| 17 | - QPixmap image("/prime/manual/manual-15.png"); | ||
| 18 | - int w = ui->ctrLbManual->width(); | ||
| 19 | - int h = ui->ctrLbManual->height(); | 17 | + //ui->ctrLbManual->setScaledContents(true); |
| 18 | + QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0'))); | ||
| 20 | ui->ctrLbManual->setPixmap(image); | 19 | ui->ctrLbManual->setPixmap(image); |
| 21 | - //ui->ctrLbManual->setPixmap(image.scaled(w,h,Qt::IgnoreAspectRatio)); | ||
| 22 | } | 20 | } |
| 23 | 21 | ||
| 24 | ManualViewerDlg::~ManualViewerDlg() | 22 | ManualViewerDlg::~ManualViewerDlg() |
| @@ -30,3 +28,26 @@ void ManualViewerDlg::on_backButton_clicked() | @@ -30,3 +28,26 @@ void ManualViewerDlg::on_backButton_clicked() | ||
| 30 | { | 28 | { |
| 31 | deleteLater(); | 29 | deleteLater(); |
| 32 | } | 30 | } |
| 31 | + | ||
| 32 | +void ManualViewerDlg::on_leftButton_clicked() | ||
| 33 | +{ | ||
| 34 | + m_nCurPage--; | ||
| 35 | + if(m_nCurPage<1) m_nCurPage=MAX_MANUAL_PAGE; | ||
| 36 | + QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0'))); | ||
| 37 | + ui->ctrLbManual->setPixmap(image); | ||
| 38 | + //ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation)); | ||
| 39 | +} | ||
| 40 | + | ||
| 41 | + | ||
| 42 | + | ||
| 43 | +void ManualViewerDlg::on_rightButton_clicked() | ||
| 44 | +{ | ||
| 45 | + m_nCurPage++; | ||
| 46 | + if(m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1; | ||
| 47 | + QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0'))); | ||
| 48 | +// QPixmap scale = image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation); | ||
| 49 | +// qDebug() << image.size(); | ||
| 50 | +// qDebug() << scale.size(); | ||
| 51 | +// ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation)); | ||
| 52 | + ui->ctrLbManual->setPixmap(image); | ||
| 53 | +} |
app/gui/oven_control/manualviewerdlg.h
| @@ -3,6 +3,15 @@ | @@ -3,6 +3,15 @@ | ||
| 3 | 3 | ||
| 4 | #include <QDialog> | 4 | #include <QDialog> |
| 5 | 5 | ||
| 6 | +#define MAX_MANUAL_PAGE 60 | ||
| 7 | +#define START_X 0 | ||
| 8 | +#define START_Y 0 | ||
| 9 | +#define SIZE_WIDTH 900 | ||
| 10 | +#define SIZE_HEIGHT 1450 | ||
| 11 | + | ||
| 12 | +#define AUTO_COOK_PAGE 36 | ||
| 13 | +#define MANUAL_COOK_PAGE 30 | ||
| 14 | + | ||
| 6 | namespace Ui { | 15 | namespace Ui { |
| 7 | class ManualViewerDlg; | 16 | class ManualViewerDlg; |
| 8 | } | 17 | } |
| @@ -12,14 +21,19 @@ class ManualViewerDlg : public QDialog | @@ -12,14 +21,19 @@ class ManualViewerDlg : public QDialog | ||
| 12 | Q_OBJECT | 21 | Q_OBJECT |
| 13 | 22 | ||
| 14 | public: | 23 | public: |
| 15 | - explicit ManualViewerDlg(QWidget *parent = 0); | 24 | + explicit ManualViewerDlg(QWidget *parent = 0, uint32_t start=1); |
| 16 | ~ManualViewerDlg(); | 25 | ~ManualViewerDlg(); |
| 17 | 26 | ||
| 18 | private slots: | 27 | private slots: |
| 19 | void on_backButton_clicked(); | 28 | void on_backButton_clicked(); |
| 20 | 29 | ||
| 30 | + void on_leftButton_clicked(); | ||
| 31 | + | ||
| 32 | + void on_rightButton_clicked(); | ||
| 33 | + | ||
| 21 | private: | 34 | private: |
| 22 | Ui::ManualViewerDlg *ui; | 35 | Ui::ManualViewerDlg *ui; |
| 36 | + uint32_t m_nCurPage; | ||
| 23 | }; | 37 | }; |
| 24 | 38 | ||
| 25 | #endif // MANUALVIEWERDLG_H | 39 | #endif // MANUALVIEWERDLG_H |
app/gui/oven_control/manualviewerdlg.ui
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | </rect> | 11 | </rect> |
| 12 | </property> | 12 | </property> |
| 13 | <property name="styleSheet"> | 13 | <property name="styleSheet"> |
| 14 | - <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | 14 | + <string notr="true">#centralwidget { background-image: url(:/images/background/original.png); } |
| 15 | #bottomBar { background-image: url(:/images/bottom_bar/background.png); } | 15 | #bottomBar { background-image: url(:/images/bottom_bar/background.png); } |
| 16 | #midwidget { background-image: url(:/images/config/service/realtime_parts_bgnd.png); }</string> | 16 | #midwidget { background-image: url(:/images/config/service/realtime_parts_bgnd.png); }</string> |
| 17 | </property> | 17 | </property> |
| @@ -20,82 +20,13 @@ | @@ -20,82 +20,13 @@ | ||
| 20 | <rect> | 20 | <rect> |
| 21 | <x>0</x> | 21 | <x>0</x> |
| 22 | <y>0</y> | 22 | <y>0</y> |
| 23 | - <width>1555</width> | 23 | + <width>900</width> |
| 24 | <height>1600</height> | 24 | <height>1600</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | <property name="styleSheet"> | 27 | <property name="styleSheet"> |
| 28 | <string notr="true"/> | 28 | <string notr="true"/> |
| 29 | </property> | 29 | </property> |
| 30 | - <widget class="QStackedWidget" name="upperStack"> | ||
| 31 | - <property name="geometry"> | ||
| 32 | - <rect> | ||
| 33 | - <x>0</x> | ||
| 34 | - <y>0</y> | ||
| 35 | - <width>900</width> | ||
| 36 | - <height>426</height> | ||
| 37 | - </rect> | ||
| 38 | - </property> | ||
| 39 | - <widget class="QWidget" name="clockContainer"> | ||
| 40 | - <property name="styleSheet"> | ||
| 41 | - <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | ||
| 42 | - </property> | ||
| 43 | - <widget class="Clock" name="clock" native="true"> | ||
| 44 | - <property name="geometry"> | ||
| 45 | - <rect> | ||
| 46 | - <x>272</x> | ||
| 47 | - <y>36</y> | ||
| 48 | - <width>356</width> | ||
| 49 | - <height>355</height> | ||
| 50 | - </rect> | ||
| 51 | - </property> | ||
| 52 | - </widget> | ||
| 53 | - <widget class="WashWarnIcon" name="label"> | ||
| 54 | - <property name="geometry"> | ||
| 55 | - <rect> | ||
| 56 | - <x>800</x> | ||
| 57 | - <y>320</y> | ||
| 58 | - <width>80</width> | ||
| 59 | - <height>84</height> | ||
| 60 | - </rect> | ||
| 61 | - </property> | ||
| 62 | - </widget> | ||
| 63 | - <widget class="DemoIcon" name="label_2"> | ||
| 64 | - <property name="geometry"> | ||
| 65 | - <rect> | ||
| 66 | - <x>780</x> | ||
| 67 | - <y>230</y> | ||
| 68 | - <width>101</width> | ||
| 69 | - <height>90</height> | ||
| 70 | - </rect> | ||
| 71 | - </property> | ||
| 72 | - </widget> | ||
| 73 | - <widget class="HalfEnergyIcon" name="label_3"> | ||
| 74 | - <property name="geometry"> | ||
| 75 | - <rect> | ||
| 76 | - <x>780</x> | ||
| 77 | - <y>160</y> | ||
| 78 | - <width>108</width> | ||
| 79 | - <height>67</height> | ||
| 80 | - </rect> | ||
| 81 | - </property> | ||
| 82 | - </widget> | ||
| 83 | - <widget class="DigitalClock" name="label_4"> | ||
| 84 | - <property name="geometry"> | ||
| 85 | - <rect> | ||
| 86 | - <x>20</x> | ||
| 87 | - <y>310</y> | ||
| 88 | - <width>600</width> | ||
| 89 | - <height>100</height> | ||
| 90 | - </rect> | ||
| 91 | - </property> | ||
| 92 | - <property name="alignment"> | ||
| 93 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 94 | - </property> | ||
| 95 | - </widget> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="QWidget" name="page_2"/> | ||
| 98 | - </widget> | ||
| 99 | <widget class="QWidget" name="bottomBar" native="true"> | 30 | <widget class="QWidget" name="bottomBar" native="true"> |
| 100 | <property name="geometry"> | 31 | <property name="geometry"> |
| 101 | <rect> | 32 | <rect> |
| @@ -108,7 +39,7 @@ | @@ -108,7 +39,7 @@ | ||
| 108 | <widget class="QPushButton" name="backButton"> | 39 | <widget class="QPushButton" name="backButton"> |
| 109 | <property name="geometry"> | 40 | <property name="geometry"> |
| 110 | <rect> | 41 | <rect> |
| 111 | - <x>343</x> | 42 | + <x>401</x> |
| 112 | <y>26</y> | 43 | <y>26</y> |
| 113 | <width>97</width> | 44 | <width>97</width> |
| 114 | <height>97</height> | 45 | <height>97</height> |
| @@ -132,52 +63,63 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba | @@ -132,52 +63,63 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba | ||
| 132 | <widget class="QLabel" name="ctrLbManual"> | 63 | <widget class="QLabel" name="ctrLbManual"> |
| 133 | <property name="geometry"> | 64 | <property name="geometry"> |
| 134 | <rect> | 65 | <rect> |
| 135 | - <x>30</x> | ||
| 136 | - <y>425</y> | ||
| 137 | - <width>840</width> | ||
| 138 | - <height>1021</height> | 66 | + <x>0</x> |
| 67 | + <y>5</y> | ||
| 68 | + <width>901</width> | ||
| 69 | + <height>1441</height> | ||
| 139 | </rect> | 70 | </rect> |
| 140 | </property> | 71 | </property> |
| 141 | <property name="text"> | 72 | <property name="text"> |
| 142 | - <string notr="true">TextLabel</string> | 73 | + <string notr="true"/> |
| 143 | </property> | 74 | </property> |
| 144 | <property name="scaledContents"> | 75 | <property name="scaledContents"> |
| 145 | - <bool>true</bool> | 76 | + <bool>false</bool> |
| 146 | </property> | 77 | </property> |
| 147 | <property name="alignment"> | 78 | <property name="alignment"> |
| 148 | <set>Qt::AlignCenter</set> | 79 | <set>Qt::AlignCenter</set> |
| 149 | </property> | 80 | </property> |
| 150 | </widget> | 81 | </widget> |
| 82 | + <widget class="QPushButton" name="leftButton"> | ||
| 83 | + <property name="geometry"> | ||
| 84 | + <rect> | ||
| 85 | + <x>14</x> | ||
| 86 | + <y>770</y> | ||
| 87 | + <width>100</width> | ||
| 88 | + <height>100</height> | ||
| 89 | + </rect> | ||
| 90 | + </property> | ||
| 91 | + <property name="styleSheet"> | ||
| 92 | + <string notr="true">QPushButton { border-image: url(:/images/help/page_prev.png); } | ||
| 93 | +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/help/page_prev_over.png); }</string> | ||
| 94 | + </property> | ||
| 95 | + <property name="text"> | ||
| 96 | + <string/> | ||
| 97 | + </property> | ||
| 98 | + </widget> | ||
| 99 | + <widget class="QPushButton" name="rightButton"> | ||
| 100 | + <property name="geometry"> | ||
| 101 | + <rect> | ||
| 102 | + <x>788</x> | ||
| 103 | + <y>770</y> | ||
| 104 | + <width>100</width> | ||
| 105 | + <height>100</height> | ||
| 106 | + </rect> | ||
| 107 | + </property> | ||
| 108 | + <property name="styleSheet"> | ||
| 109 | + <string notr="true">QPushButton { border-image: url(:/images/help/page_next.png); } | ||
| 110 | +QPushButton:pressed , QPushButton:focus { border-image: url(:/images/help/page_next_over.png); }</string> | ||
| 111 | + </property> | ||
| 112 | + <property name="text"> | ||
| 113 | + <string/> | ||
| 114 | + </property> | ||
| 115 | + </widget> | ||
| 151 | </widget> | 116 | </widget> |
| 152 | </widget> | 117 | </widget> |
| 153 | - <customwidgets> | ||
| 154 | - <customwidget> | ||
| 155 | - <class>Clock</class> | ||
| 156 | - <extends>QWidget</extends> | ||
| 157 | - <header>clock.h</header> | ||
| 158 | - <container>1</container> | ||
| 159 | - </customwidget> | ||
| 160 | - <customwidget> | ||
| 161 | - <class>WashWarnIcon</class> | ||
| 162 | - <extends>QLabel</extends> | ||
| 163 | - <header>washwarnicon.h</header> | ||
| 164 | - </customwidget> | ||
| 165 | - <customwidget> | ||
| 166 | - <class>DemoIcon</class> | ||
| 167 | - <extends>QLabel</extends> | ||
| 168 | - <header>demoicon.h</header> | ||
| 169 | - </customwidget> | ||
| 170 | - <customwidget> | ||
| 171 | - <class>HalfEnergyIcon</class> | ||
| 172 | - <extends>QLabel</extends> | ||
| 173 | - <header>halfenergyicon.h</header> | ||
| 174 | - </customwidget> | ||
| 175 | - <customwidget> | ||
| 176 | - <class>DigitalClock</class> | ||
| 177 | - <extends>QLabel</extends> | ||
| 178 | - <header>digitalclock.h</header> | ||
| 179 | - </customwidget> | ||
| 180 | - </customwidgets> | 118 | + <tabstops> |
| 119 | + <tabstop>backButton</tabstop> | ||
| 120 | + <tabstop>leftButton</tabstop> | ||
| 121 | + <tabstop>rightButton</tabstop> | ||
| 122 | + </tabstops> | ||
| 181 | <resources/> | 123 | <resources/> |
| 182 | <connections/> | 124 | <connections/> |
| 183 | </ui> | 125 | </ui> |
app/gui/oven_control/multicookautowindow.cpp
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | 5 | ||
| 6 | #include "soundplayer.h" | 6 | #include "soundplayer.h" |
| 7 | #include "confirmpopup.h" | 7 | #include "confirmpopup.h" |
| 8 | +#include "manualviewerdlg.h" | ||
| 8 | 9 | ||
| 9 | MultiCookAutoWindow::MultiCookAutoWindow(QWidget *parent) : | 10 | MultiCookAutoWindow::MultiCookAutoWindow(QWidget *parent) : |
| 10 | QMainWindow(parent), | 11 | QMainWindow(parent), |
| @@ -158,5 +159,7 @@ void MultiCookAutoWindow::on_backButton_clicked() | @@ -158,5 +159,7 @@ void MultiCookAutoWindow::on_backButton_clicked() | ||
| 158 | 159 | ||
| 159 | void MultiCookAutoWindow::on_helpButton_clicked() | 160 | void MultiCookAutoWindow::on_helpButton_clicked() |
| 160 | { | 161 | { |
| 161 | - | 162 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 163 | + dlg->showFullScreen(); | ||
| 164 | + dlg->raise(); | ||
| 162 | } | 165 | } |
app/gui/oven_control/multicookbook.cpp
| 1 | #include "multicookbook.h" | 1 | #include "multicookbook.h" |
| 2 | 2 | ||
| 3 | +#include <QErrorMessage> | ||
| 4 | + | ||
| 3 | namespace | 5 | namespace |
| 4 | { | 6 | { |
| 5 | 7 | ||
| 6 | -void showError(QString message) | 8 | +static QErrorMessage *errorDialog = Q_NULLPTR; |
| 9 | +void showError(QString errorMessage) | ||
| 7 | { | 10 | { |
| 11 | + if (errorDialog == NULL) | ||
| 12 | + { | ||
| 13 | + errorDialog = new QErrorMessage; | ||
| 14 | + errorDialog->setWindowModality(Qt::ApplicationModal); | ||
| 15 | + errorDialog->setGeometry(QRect(0, 426, 900, 426)); | ||
| 16 | + } | ||
| 8 | 17 | ||
| 18 | + errorDialog->showMessage(errorMessage); | ||
| 19 | + errorDialog->exec(); | ||
| 9 | } | 20 | } |
| 10 | 21 | ||
| 11 | } | 22 | } |
app/gui/oven_control/multicookmanualwindow.cpp
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | #include "mainwindow.h" | 8 | #include "mainwindow.h" |
| 9 | #include "configwindow.h" | 9 | #include "configwindow.h" |
| 10 | #include "soundplayer.h" | 10 | #include "soundplayer.h" |
| 11 | +#include "manualviewerdlg.h" | ||
| 11 | 12 | ||
| 12 | MultiCookManualWindow::MultiCookManualWindow(QWidget *parent) : | 13 | MultiCookManualWindow::MultiCookManualWindow(QWidget *parent) : |
| 13 | QMainWindow(parent), | 14 | QMainWindow(parent), |
| @@ -266,7 +267,9 @@ void MultiCookManualWindow::on_backButton_clicked() | @@ -266,7 +267,9 @@ void MultiCookManualWindow::on_backButton_clicked() | ||
| 266 | 267 | ||
| 267 | void MultiCookManualWindow::on_helpButton_clicked() | 268 | void MultiCookManualWindow::on_helpButton_clicked() |
| 268 | { | 269 | { |
| 269 | - | 270 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 271 | + dlg->showFullScreen(); | ||
| 272 | + dlg->raise(); | ||
| 270 | } | 273 | } |
| 271 | 274 | ||
| 272 | void MultiCookManualWindow::on_okButton_clicked() | 275 | void MultiCookManualWindow::on_okButton_clicked() |
app/gui/oven_control/multicookselectionwindow.cpp
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | #include "multicookmanualwindow.h" | 8 | #include "multicookmanualwindow.h" |
| 9 | #include "multicookautowindow.h" | 9 | #include "multicookautowindow.h" |
| 10 | #include "soundplayer.h" | 10 | #include "soundplayer.h" |
| 11 | +#include "manualviewerdlg.h" | ||
| 11 | 12 | ||
| 12 | MultiCookSelectionWindow::MultiCookSelectionWindow(QWidget *parent) : | 13 | MultiCookSelectionWindow::MultiCookSelectionWindow(QWidget *parent) : |
| 13 | QMainWindow(parent), | 14 | QMainWindow(parent), |
| @@ -228,7 +229,9 @@ void MultiCookSelectionWindow::on_backButton_clicked() | @@ -228,7 +229,9 @@ void MultiCookSelectionWindow::on_backButton_clicked() | ||
| 228 | 229 | ||
| 229 | void MultiCookSelectionWindow::on_helpButton_clicked() | 230 | void MultiCookSelectionWindow::on_helpButton_clicked() |
| 230 | { | 231 | { |
| 231 | - | 232 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 233 | + dlg->showFullScreen(); | ||
| 234 | + dlg->raise(); | ||
| 232 | } | 235 | } |
| 233 | 236 | ||
| 234 | void MultiCookSelectionWindow::onEncoderLeft() | 237 | void MultiCookSelectionWindow::onEncoderLeft() |
app/gui/oven_control/multicooktimebar.cpp
| @@ -41,9 +41,6 @@ void MultiCookTimeBar::paintEvent(QPaintEvent */*event*/) | @@ -41,9 +41,6 @@ void MultiCookTimeBar::paintEvent(QPaintEvent */*event*/) | ||
| 41 | QPoint c2(w * 5 / 10, y); | 41 | QPoint c2(w * 5 / 10, y); |
| 42 | QPoint c3(w * 8 / 10, y); | 42 | QPoint c3(w * 8 / 10, y); |
| 43 | 43 | ||
| 44 | -// QFont font = this->font(); | ||
| 45 | -// font.setBold(true); | ||
| 46 | - | ||
| 47 | QRect rect(0, 0, w, h); | 44 | QRect rect(0, 0, w, h); |
| 48 | 45 | ||
| 49 | QTime t = QTime::currentTime(); | 46 | QTime t = QTime::currentTime(); |
| @@ -54,7 +51,6 @@ void MultiCookTimeBar::paintEvent(QPaintEvent */*event*/) | @@ -54,7 +51,6 @@ void MultiCookTimeBar::paintEvent(QPaintEvent */*event*/) | ||
| 54 | 51 | ||
| 55 | QPainter painter(this); | 52 | QPainter painter(this); |
| 56 | painter.setPen(Qt::white); | 53 | painter.setPen(Qt::white); |
| 57 | -// painter.setFont(font); | ||
| 58 | 54 | ||
| 59 | rect.moveCenter(c1); | 55 | rect.moveCenter(c1); |
| 60 | painter.drawText(rect, Qt::AlignCenter, s1); | 56 | painter.drawText(rect, Qt::AlignCenter, s1); |
app/gui/oven_control/multicookwindow.cpp
| @@ -14,6 +14,7 @@ | @@ -14,6 +14,7 @@ | ||
| 14 | #include "configwindow.h" | 14 | #include "configwindow.h" |
| 15 | #include "washwindow.h" | 15 | #include "washwindow.h" |
| 16 | #include "mainwindow.h" | 16 | #include "mainwindow.h" |
| 17 | +#include "manualviewerdlg.h" | ||
| 17 | 18 | ||
| 18 | MultiCookWindow::MultiCookWindow(QWidget *parent) : | 19 | MultiCookWindow::MultiCookWindow(QWidget *parent) : |
| 19 | QMainWindow(parent), | 20 | QMainWindow(parent), |
| @@ -445,7 +446,9 @@ void MultiCookWindow::on_deleteButton_clicked() | @@ -445,7 +446,9 @@ void MultiCookWindow::on_deleteButton_clicked() | ||
| 445 | 446 | ||
| 446 | void MultiCookWindow::on_helpButton_clicked() | 447 | void MultiCookWindow::on_helpButton_clicked() |
| 447 | { | 448 | { |
| 448 | - | 449 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 450 | + dlg->showFullScreen(); | ||
| 451 | + dlg->raise(); | ||
| 449 | } | 452 | } |
| 450 | 453 | ||
| 451 | void MultiCookWindow::onEncoderLeft() | 454 | void MultiCookWindow::onEncoderLeft() |
app/gui/oven_control/operationtimeheat.cpp
| @@ -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
| @@ -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
| @@ -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
| @@ -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
| @@ -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
| @@ -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/oven_control.pro
| @@ -65,7 +65,6 @@ SOURCES += main.cpp\ | @@ -65,7 +65,6 @@ SOURCES += main.cpp\ | ||
| 65 | yesnopopupdlg.cpp \ | 65 | yesnopopupdlg.cpp \ |
| 66 | configpanelbutton.cpp \ | 66 | configpanelbutton.cpp \ |
| 67 | config.cpp \ | 67 | config.cpp \ |
| 68 | -#basicsettingwindow.cpp \ | ||
| 69 | programmingwindow.cpp \ | 68 | programmingwindow.cpp \ |
| 70 | primewindow.cpp \ | 69 | primewindow.cpp \ |
| 71 | cookpanelbutton.cpp \ | 70 | cookpanelbutton.cpp \ |
| @@ -122,7 +121,6 @@ SOURCES += main.cpp\ | @@ -122,7 +121,6 @@ SOURCES += main.cpp\ | ||
| 122 | autocookselectionpopup.cpp \ | 121 | autocookselectionpopup.cpp \ |
| 123 | autocookcheckwindow.cpp \ | 122 | autocookcheckwindow.cpp \ |
| 124 | autocookcheckconfigwindow.cpp \ | 123 | autocookcheckconfigwindow.cpp \ |
| 125 | - #programmedcookpanelbutton.cpp \ | ||
| 126 | configdemomodedlg.cpp \ | 124 | configdemomodedlg.cpp \ |
| 127 | demoicon.cpp \ | 125 | demoicon.cpp \ |
| 128 | halfenergyicon.cpp \ | 126 | halfenergyicon.cpp \ |
| @@ -199,7 +197,6 @@ HEADERS += mainwindow.h \ | @@ -199,7 +197,6 @@ HEADERS += mainwindow.h \ | ||
| 199 | yesnopopupdlg.h \ | 197 | yesnopopupdlg.h \ |
| 200 | configpanelbutton.h \ | 198 | configpanelbutton.h \ |
| 201 | config.h \ | 199 | config.h \ |
| 202 | - #basicsettingwindow.h \ | ||
| 203 | programmingwindow.h \ | 200 | programmingwindow.h \ |
| 204 | primewindow.h \ | 201 | primewindow.h \ |
| 205 | cookpanelbutton.h \ | 202 | cookpanelbutton.h \ |
| @@ -256,7 +253,6 @@ HEADERS += mainwindow.h \ | @@ -256,7 +253,6 @@ HEADERS += mainwindow.h \ | ||
| 256 | autocookselectionpopup.h \ | 253 | autocookselectionpopup.h \ |
| 257 | autocookcheckwindow.h \ | 254 | autocookcheckwindow.h \ |
| 258 | autocookcheckconfigwindow.h \ | 255 | autocookcheckconfigwindow.h \ |
| 259 | - #programmedcookpanelbutton.h \ | ||
| 260 | configdemomodedlg.h \ | 256 | configdemomodedlg.h \ |
| 261 | demoicon.h \ | 257 | demoicon.h \ |
| 262 | halfenergyicon.h \ | 258 | halfenergyicon.h \ |
| @@ -310,7 +306,6 @@ FORMS += mainwindow.ui \ | @@ -310,7 +306,6 @@ FORMS += mainwindow.ui \ | ||
| 310 | adjustmentwindow.ui \ | 306 | adjustmentwindow.ui \ |
| 311 | yesnopopupdlg.ui \ | 307 | yesnopopupdlg.ui \ |
| 312 | configpanelbutton.ui \ | 308 | configpanelbutton.ui \ |
| 313 | - #basicsettingwindow.ui \ | ||
| 314 | programmingwindow.ui \ | 309 | programmingwindow.ui \ |
| 315 | primewindow.ui \ | 310 | primewindow.ui \ |
| 316 | cookpanelbutton.ui \ | 311 | cookpanelbutton.ui \ |
| @@ -355,7 +350,6 @@ FORMS += mainwindow.ui \ | @@ -355,7 +350,6 @@ FORMS += mainwindow.ui \ | ||
| 355 | autocookselectionpopup.ui \ | 350 | autocookselectionpopup.ui \ |
| 356 | autocookcheckwindow.ui \ | 351 | autocookcheckwindow.ui \ |
| 357 | autocookcheckconfigwindow.ui \ | 352 | autocookcheckconfigwindow.ui \ |
| 358 | - #programmedcookpanelbutton.ui \ | ||
| 359 | configdemomodedlg.ui \ | 353 | configdemomodedlg.ui \ |
| 360 | notipopupdlg.ui \ | 354 | notipopupdlg.ui \ |
| 361 | configsteamwashdlg.ui \ | 355 | configsteamwashdlg.ui \ |
app/gui/oven_control/primewindow.cpp
| @@ -12,6 +12,7 @@ | @@ -12,6 +12,7 @@ | ||
| 12 | #include "configwindow.h" | 12 | #include "configwindow.h" |
| 13 | #include "washwindow.h" | 13 | #include "washwindow.h" |
| 14 | #include "mainwindow.h" | 14 | #include "mainwindow.h" |
| 15 | +#include "manualviewerdlg.h" | ||
| 15 | 16 | ||
| 16 | PrimeWindow::PrimeWindow(QWidget *parent) : | 17 | PrimeWindow::PrimeWindow(QWidget *parent) : |
| 17 | QMainWindow(parent), | 18 | QMainWindow(parent), |
| @@ -287,7 +288,9 @@ void PrimeWindow::on_washButton_clicked() | @@ -287,7 +288,9 @@ void PrimeWindow::on_washButton_clicked() | ||
| 287 | 288 | ||
| 288 | void PrimeWindow::on_helpButton_clicked() | 289 | void PrimeWindow::on_helpButton_clicked() |
| 289 | { | 290 | { |
| 290 | - | 291 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 292 | + dlg->showFullScreen(); | ||
| 293 | + dlg->raise(); | ||
| 291 | } | 294 | } |
| 292 | 295 | ||
| 293 | void PrimeWindow::onEncoderLeft() | 296 | void PrimeWindow::onEncoderLeft() |
app/gui/oven_control/programmedcookpanelbutton.cpp
| @@ -1,175 +0,0 @@ | @@ -1,175 +0,0 @@ | ||
| 1 | -#include "programmedcookpanelbutton.h" | ||
| 2 | -#include "ui_programmedcookpanelbutton.h" | ||
| 3 | - | ||
| 4 | -#include <QKeyEvent> | ||
| 5 | - | ||
| 6 | -#include "soundplayer.h" | ||
| 7 | - | ||
| 8 | -ProgrammedCookPanelButton::ProgrammedCookPanelButton(CookRecord record, QWidget *parent) : | ||
| 9 | - QWidget(parent), | ||
| 10 | - record(record), | ||
| 11 | - ui(new Ui::ProgrammedCookPanelButton), | ||
| 12 | - rendered(false), | ||
| 13 | - longPressEnabled(false) | ||
| 14 | -{ | ||
| 15 | - ui->setupUi(this); | ||
| 16 | - | ||
| 17 | - setText(record.name); | ||
| 18 | - | ||
| 19 | - foreach (QPushButton *button, findChildren<QPushButton *>()) | ||
| 20 | - connect(button, &QPushButton::pressed, SoundPlayer::playClick); | ||
| 21 | - | ||
| 22 | - longPressedTimer.setSingleShot(true); | ||
| 23 | - longPressedTimer.setInterval(3000); | ||
| 24 | - connect(&longPressedTimer, SIGNAL(timeout()), SLOT(emitLongPressed())); | ||
| 25 | -} | ||
| 26 | - | ||
| 27 | -ProgrammedCookPanelButton::~ProgrammedCookPanelButton() | ||
| 28 | -{ | ||
| 29 | - delete ui; | ||
| 30 | -} | ||
| 31 | - | ||
| 32 | -void ProgrammedCookPanelButton::setText(QString text) | ||
| 33 | -{ | ||
| 34 | - ui->pushButton->setText(text); | ||
| 35 | -} | ||
| 36 | - | ||
| 37 | -void ProgrammedCookPanelButton::showInfo() | ||
| 38 | -{ | ||
| 39 | - if (!rendered) | ||
| 40 | - { | ||
| 41 | - QPixmap p = CookHistory::render(record); | ||
| 42 | - | ||
| 43 | - label = new QLabel(this); | ||
| 44 | - label->setPixmap(p); | ||
| 45 | - label->setGeometry((width() - p.width()) / 2, 65, p.width(), p.height()); | ||
| 46 | - } | ||
| 47 | - | ||
| 48 | - label->show(); | ||
| 49 | - setMinimumHeight(ui->pushButton->height() + label->height()); | ||
| 50 | -} | ||
| 51 | - | ||
| 52 | -void ProgrammedCookPanelButton::hideInfo() | ||
| 53 | -{ | ||
| 54 | - label->hide(); | ||
| 55 | - setMinimumHeight(ui->pushButton->height()); | ||
| 56 | -} | ||
| 57 | - | ||
| 58 | -void ProgrammedCookPanelButton::setLongPressEnabled(bool enabled) | ||
| 59 | -{ | ||
| 60 | - longPressEnabled = enabled; | ||
| 61 | -} | ||
| 62 | - | ||
| 63 | -QPushButton *ProgrammedCookPanelButton::bar() | ||
| 64 | -{ | ||
| 65 | - return ui->pushButton; | ||
| 66 | -} | ||
| 67 | - | ||
| 68 | -QPushButton *ProgrammedCookPanelButton::infoButton() | ||
| 69 | -{ | ||
| 70 | - return ui->showInfoButton; | ||
| 71 | -} | ||
| 72 | - | ||
| 73 | -QPushButton *ProgrammedCookPanelButton::deleteButton() | ||
| 74 | -{ | ||
| 75 | - return ui->deleteButton; | ||
| 76 | -} | ||
| 77 | - | ||
| 78 | -void ProgrammedCookPanelButton::setEnabled(bool enabled) | ||
| 79 | -{ | ||
| 80 | - ui->pushButton->setEnabled(enabled); | ||
| 81 | - ui->showInfoButton->setEnabled(enabled); | ||
| 82 | - ui->deleteButton->setEnabled(enabled); | ||
| 83 | -} | ||
| 84 | - | ||
| 85 | -void ProgrammedCookPanelButton::keyPressEvent(QKeyEvent *event) | ||
| 86 | -{ | ||
| 87 | - switch (event->key()) | ||
| 88 | - { | ||
| 89 | - case 0x01000032: // Turn left | ||
| 90 | - event->ignore(); | ||
| 91 | - break; | ||
| 92 | - case 0x01000031: // Push | ||
| 93 | - pushed = focusWidget(); | ||
| 94 | - if (pushed == ui->pushButton) | ||
| 95 | - on_pushButton_pressed(); | ||
| 96 | - break; | ||
| 97 | - case 0x01000030: // Turn right | ||
| 98 | - event->ignore(); | ||
| 99 | - break; | ||
| 100 | - } | ||
| 101 | -} | ||
| 102 | - | ||
| 103 | -void ProgrammedCookPanelButton::keyReleaseEvent(QKeyEvent *event) | ||
| 104 | -{ | ||
| 105 | - switch (event->key()) | ||
| 106 | - { | ||
| 107 | - case 0x01000032: // Turn left | ||
| 108 | - event->ignore(); | ||
| 109 | - break; | ||
| 110 | - case 0x01000031: // Push | ||
| 111 | - if (pushed == ui->pushButton) | ||
| 112 | - on_pushButton_released(); | ||
| 113 | - | ||
| 114 | - if (focusWidget() == pushed) | ||
| 115 | - onEncoderClicked(pushed); | ||
| 116 | - | ||
| 117 | - pushed = NULL; | ||
| 118 | - break; | ||
| 119 | - case 0x01000030: // Turn right | ||
| 120 | - event->ignore(); | ||
| 121 | - break; | ||
| 122 | - } | ||
| 123 | -} | ||
| 124 | - | ||
| 125 | -void ProgrammedCookPanelButton::onEncoderLeft() | ||
| 126 | -{ | ||
| 127 | - | ||
| 128 | -} | ||
| 129 | - | ||
| 130 | -void ProgrammedCookPanelButton::onEncoderRight() | ||
| 131 | -{ | ||
| 132 | - | ||
| 133 | -} | ||
| 134 | - | ||
| 135 | -void ProgrammedCookPanelButton::onEncoderClicked(QWidget *clicked) | ||
| 136 | -{ | ||
| 137 | - QPushButton *b = qobject_cast<QPushButton *>(clicked); | ||
| 138 | - if (b) | ||
| 139 | - b->click(); | ||
| 140 | -} | ||
| 141 | - | ||
| 142 | -void ProgrammedCookPanelButton::emitLongPressed() | ||
| 143 | -{ | ||
| 144 | - emitted = true; | ||
| 145 | - emit longPressed(this); | ||
| 146 | -} | ||
| 147 | - | ||
| 148 | -void ProgrammedCookPanelButton::on_pushButton_pressed() | ||
| 149 | -{ | ||
| 150 | - longPressedTimer.start(); | ||
| 151 | - emitted = false; | ||
| 152 | -} | ||
| 153 | - | ||
| 154 | -void ProgrammedCookPanelButton::on_pushButton_released() | ||
| 155 | -{ | ||
| 156 | - longPressedTimer.stop(); | ||
| 157 | -} | ||
| 158 | - | ||
| 159 | -void ProgrammedCookPanelButton::on_pushButton_clicked() | ||
| 160 | -{ | ||
| 161 | - if (longPressEnabled && emitted) | ||
| 162 | - return; | ||
| 163 | - | ||
| 164 | - emit clicked(this); | ||
| 165 | -} | ||
| 166 | - | ||
| 167 | -void ProgrammedCookPanelButton::on_showInfoButton_clicked() | ||
| 168 | -{ | ||
| 169 | - emit infoClicked(this); | ||
| 170 | -} | ||
| 171 | - | ||
| 172 | -void ProgrammedCookPanelButton::on_deleteButton_clicked() | ||
| 173 | -{ | ||
| 174 | - emit deleteClicked(this); | ||
| 175 | -} |
app/gui/oven_control/programmedcookpanelbutton.h
| @@ -1,74 +0,0 @@ | @@ -1,74 +0,0 @@ | ||
| 1 | -#ifndef PROGRAMMEDCOOKPANELBUTTON_H | ||
| 2 | -#define PROGRAMMEDCOOKPANELBUTTON_H | ||
| 3 | - | ||
| 4 | -#include <QWidget> | ||
| 5 | -#include <QLabel> | ||
| 6 | -#include <QButtonGroup> | ||
| 7 | -#include <QTimer> | ||
| 8 | -#include <QPushButton> | ||
| 9 | - | ||
| 10 | -#include "cookhistory.h" | ||
| 11 | - | ||
| 12 | -namespace Ui { | ||
| 13 | -class ProgrammedCookPanelButton; | ||
| 14 | -} | ||
| 15 | - | ||
| 16 | -class ProgrammedCookPanelButton : public QWidget | ||
| 17 | -{ | ||
| 18 | - Q_OBJECT | ||
| 19 | - | ||
| 20 | -public: | ||
| 21 | - explicit ProgrammedCookPanelButton(CookRecord record, QWidget *parent = 0); | ||
| 22 | - ~ProgrammedCookPanelButton(); | ||
| 23 | - | ||
| 24 | - void setText(QString text); | ||
| 25 | - void showInfo(); | ||
| 26 | - void hideInfo(); | ||
| 27 | - | ||
| 28 | - void setLongPressEnabled(bool enabled); | ||
| 29 | - | ||
| 30 | - QPushButton *bar(); | ||
| 31 | - QPushButton *infoButton(); | ||
| 32 | - QPushButton *deleteButton(); | ||
| 33 | - | ||
| 34 | - CookRecord record; | ||
| 35 | - | ||
| 36 | -public slots: | ||
| 37 | - void setEnabled(bool enabled = true); | ||
| 38 | - | ||
| 39 | -protected: | ||
| 40 | - void keyPressEvent(QKeyEvent *event); | ||
| 41 | - void keyReleaseEvent(QKeyEvent *event); | ||
| 42 | - | ||
| 43 | -private: | ||
| 44 | - Ui::ProgrammedCookPanelButton *ui; | ||
| 45 | - | ||
| 46 | - QTimer longPressedTimer; | ||
| 47 | - bool rendered; | ||
| 48 | - QLabel *label; | ||
| 49 | - bool emitted; | ||
| 50 | - bool longPressEnabled; | ||
| 51 | - | ||
| 52 | - QWidget *pushed = NULL; | ||
| 53 | - | ||
| 54 | - void onEncoderLeft(); | ||
| 55 | - void onEncoderRight(); | ||
| 56 | - void onEncoderClicked(QWidget *clicked); | ||
| 57 | - | ||
| 58 | -private slots: | ||
| 59 | - void emitLongPressed(); | ||
| 60 | - | ||
| 61 | - void on_pushButton_pressed(); | ||
| 62 | - void on_pushButton_released(); | ||
| 63 | - void on_pushButton_clicked(); | ||
| 64 | - void on_showInfoButton_clicked(); | ||
| 65 | - void on_deleteButton_clicked(); | ||
| 66 | - | ||
| 67 | -signals: | ||
| 68 | - void clicked(ProgrammedCookPanelButton *); | ||
| 69 | - void infoClicked(ProgrammedCookPanelButton *); | ||
| 70 | - void deleteClicked(ProgrammedCookPanelButton *); | ||
| 71 | - void longPressed(ProgrammedCookPanelButton *); | ||
| 72 | -}; | ||
| 73 | - | ||
| 74 | -#endif // PROGRAMMEDCOOKPANELBUTTON_H |
app/gui/oven_control/programmedcookpanelbutton.ui
| @@ -1,118 +0,0 @@ | @@ -1,118 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<ui version="4.0"> | ||
| 3 | - <class>ProgrammedCookPanelButton</class> | ||
| 4 | - <widget class="QWidget" name="ProgrammedCookPanelButton"> | ||
| 5 | - <property name="geometry"> | ||
| 6 | - <rect> | ||
| 7 | - <x>0</x> | ||
| 8 | - <y>0</y> | ||
| 9 | - <width>821</width> | ||
| 10 | - <height>65</height> | ||
| 11 | - </rect> | ||
| 12 | - </property> | ||
| 13 | - <property name="windowTitle"> | ||
| 14 | - <string>Form</string> | ||
| 15 | - </property> | ||
| 16 | - <property name="styleSheet"> | ||
| 17 | - <string notr="true">QPushButton { | ||
| 18 | -background-position: center; | ||
| 19 | -background-repeat: no-repeat; | ||
| 20 | -border: none; | ||
| 21 | -}</string> | ||
| 22 | - </property> | ||
| 23 | - <widget class="QPushButton" name="showInfoButton"> | ||
| 24 | - <property name="geometry"> | ||
| 25 | - <rect> | ||
| 26 | - <x>670</x> | ||
| 27 | - <y>0</y> | ||
| 28 | - <width>70</width> | ||
| 29 | - <height>65</height> | ||
| 30 | - </rect> | ||
| 31 | - </property> | ||
| 32 | - <property name="styleSheet"> | ||
| 33 | - <string notr="true">QPushButton { background-image: url(:/images/etc/bar_icon_01.png); } | ||
| 34 | -QPushButton:pressed { background-image: url(:/images/etc/bar_icon_01_ov.png); } | ||
| 35 | -QPushButton:focus { background-image: url(:/images/etc/bar_icon_01_ov.png); }</string> | ||
| 36 | - </property> | ||
| 37 | - <property name="text"> | ||
| 38 | - <string/> | ||
| 39 | - </property> | ||
| 40 | - <property name="checkable"> | ||
| 41 | - <bool>true</bool> | ||
| 42 | - </property> | ||
| 43 | - <property name="autoExclusive"> | ||
| 44 | - <bool>true</bool> | ||
| 45 | - </property> | ||
| 46 | - </widget> | ||
| 47 | - <widget class="QPushButton" name="deleteButton"> | ||
| 48 | - <property name="geometry"> | ||
| 49 | - <rect> | ||
| 50 | - <x>750</x> | ||
| 51 | - <y>0</y> | ||
| 52 | - <width>60</width> | ||
| 53 | - <height>65</height> | ||
| 54 | - </rect> | ||
| 55 | - </property> | ||
| 56 | - <property name="styleSheet"> | ||
| 57 | - <string notr="true">QPushButton { background-image: url(:/images/etc/bar_icon_02.png); } | ||
| 58 | -QPushButton:pressed { background-image: url(:/images/etc/bar_icon_02_ov.png); } | ||
| 59 | -QPushButton:focus { background-image: url(:/images/etc/bar_icon_02_ov.png); }</string> | ||
| 60 | - </property> | ||
| 61 | - <property name="text"> | ||
| 62 | - <string/> | ||
| 63 | - </property> | ||
| 64 | - </widget> | ||
| 65 | - <widget class="QPushButton" name="pushButton"> | ||
| 66 | - <property name="geometry"> | ||
| 67 | - <rect> | ||
| 68 | - <x>0</x> | ||
| 69 | - <y>0</y> | ||
| 70 | - <width>821</width> | ||
| 71 | - <height>65</height> | ||
| 72 | - </rect> | ||
| 73 | - </property> | ||
| 74 | - <property name="sizePolicy"> | ||
| 75 | - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | ||
| 76 | - <horstretch>0</horstretch> | ||
| 77 | - <verstretch>0</verstretch> | ||
| 78 | - </sizepolicy> | ||
| 79 | - </property> | ||
| 80 | - <property name="minimumSize"> | ||
| 81 | - <size> | ||
| 82 | - <width>821</width> | ||
| 83 | - <height>65</height> | ||
| 84 | - </size> | ||
| 85 | - </property> | ||
| 86 | - <property name="maximumSize"> | ||
| 87 | - <size> | ||
| 88 | - <width>821</width> | ||
| 89 | - <height>65</height> | ||
| 90 | - </size> | ||
| 91 | - </property> | ||
| 92 | - <property name="font"> | ||
| 93 | - <font> | ||
| 94 | - <family>Roboto</family> | ||
| 95 | - <pointsize>11</pointsize> | ||
| 96 | - </font> | ||
| 97 | - </property> | ||
| 98 | - <property name="styleSheet"> | ||
| 99 | - <string notr="true">QPushButton { | ||
| 100 | -background-image: url(:/images/etc/bar_03.png); | ||
| 101 | -color: white; | ||
| 102 | -text-align: left; | ||
| 103 | -padding: 0px 40px; | ||
| 104 | -} | ||
| 105 | -QPushButton:pressed { background-image: url(:/images/etc/bar_02.png); } | ||
| 106 | -QPushButton:focus { background-image: url(:/images/etc/bar_02.png); }</string> | ||
| 107 | - </property> | ||
| 108 | - <property name="text"> | ||
| 109 | - <string/> | ||
| 110 | - </property> | ||
| 111 | - </widget> | ||
| 112 | - <zorder>pushButton</zorder> | ||
| 113 | - <zorder>showInfoButton</zorder> | ||
| 114 | - <zorder>deleteButton</zorder> | ||
| 115 | - </widget> | ||
| 116 | - <resources/> | ||
| 117 | - <connections/> | ||
| 118 | -</ui> |
app/gui/oven_control/programmingautoconfigwindow.cpp
| @@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
| 10 | #include "mainwindow.h" | 10 | #include "mainwindow.h" |
| 11 | #include "autocookselectionpopup.h" | 11 | #include "autocookselectionpopup.h" |
| 12 | #include "autocookcheckwindow.h" | 12 | #include "autocookcheckwindow.h" |
| 13 | +#include "manualviewerdlg.h" | ||
| 13 | 14 | ||
| 14 | ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) : | 15 | ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) : |
| 15 | QMainWindow(parent), | 16 | QMainWindow(parent), |
| @@ -389,7 +390,9 @@ void ProgrammingAutoConfigWindow::on_configButton_clicked() | @@ -389,7 +390,9 @@ void ProgrammingAutoConfigWindow::on_configButton_clicked() | ||
| 389 | 390 | ||
| 390 | void ProgrammingAutoConfigWindow::on_helpButton_clicked() | 391 | void ProgrammingAutoConfigWindow::on_helpButton_clicked() |
| 391 | { | 392 | { |
| 392 | - | 393 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 394 | + dlg->showFullScreen(); | ||
| 395 | + dlg->raise(); | ||
| 393 | } | 396 | } |
| 394 | 397 | ||
| 395 | void ProgrammingAutoConfigWindow::on_okButton_clicked() | 398 | void ProgrammingAutoConfigWindow::on_okButton_clicked() |
app/gui/oven_control/programmingautoselectionwindow.cpp
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | #include "programmingautoconfigwindow.h" | 8 | #include "programmingautoconfigwindow.h" |
| 9 | #include "configwindow.h" | 9 | #include "configwindow.h" |
| 10 | #include "mainwindow.h" | 10 | #include "mainwindow.h" |
| 11 | +#include "manualviewerdlg.h" | ||
| 11 | 12 | ||
| 12 | ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) : | 13 | ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) : |
| 13 | QMainWindow(parent), | 14 | QMainWindow(parent), |
| @@ -156,7 +157,9 @@ void ProgrammingAutoSelectionWindow::on_configButton_clicked() | @@ -156,7 +157,9 @@ void ProgrammingAutoSelectionWindow::on_configButton_clicked() | ||
| 156 | 157 | ||
| 157 | void ProgrammingAutoSelectionWindow::on_helpButton_clicked() | 158 | void ProgrammingAutoSelectionWindow::on_helpButton_clicked() |
| 158 | { | 159 | { |
| 159 | - | 160 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 161 | + dlg->showFullScreen(); | ||
| 162 | + dlg->raise(); | ||
| 160 | } | 163 | } |
| 161 | 164 | ||
| 162 | void ProgrammingAutoSelectionWindow::on_okButton_clicked() | 165 | void ProgrammingAutoSelectionWindow::on_okButton_clicked() |
app/gui/oven_control/programmingmanualwindow.cpp
| @@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
| 10 | #include "soundplayer.h" | 10 | #include "soundplayer.h" |
| 11 | #include "configwindow.h" | 11 | #include "configwindow.h" |
| 12 | #include "mainwindow.h" | 12 | #include "mainwindow.h" |
| 13 | +#include "manualviewerdlg.h" | ||
| 13 | 14 | ||
| 14 | ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) : | 15 | ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) : |
| 15 | QMainWindow(parent), | 16 | QMainWindow(parent), |
| @@ -538,7 +539,9 @@ void ProgrammingManualWindow::on_configButton_clicked() | @@ -538,7 +539,9 @@ void ProgrammingManualWindow::on_configButton_clicked() | ||
| 538 | 539 | ||
| 539 | void ProgrammingManualWindow::on_helpButton_clicked() | 540 | void ProgrammingManualWindow::on_helpButton_clicked() |
| 540 | { | 541 | { |
| 541 | - | 542 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 543 | + dlg->showFullScreen(); | ||
| 544 | + dlg->raise(); | ||
| 542 | } | 545 | } |
| 543 | 546 | ||
| 544 | void ProgrammingManualWindow::on_okButton_clicked() | 547 | void ProgrammingManualWindow::on_okButton_clicked() |
app/gui/oven_control/programmingselectionwindow.cpp
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | #include "soundplayer.h" | 8 | #include "soundplayer.h" |
| 9 | #include "configwindow.h" | 9 | #include "configwindow.h" |
| 10 | #include "mainwindow.h" | 10 | #include "mainwindow.h" |
| 11 | +#include "manualviewerdlg.h" | ||
| 11 | 12 | ||
| 12 | ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) : | 13 | ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) : |
| 13 | QMainWindow(parent), | 14 | QMainWindow(parent), |
| @@ -192,7 +193,9 @@ void ProgrammingSelectionWindow::on_configButton_clicked() | @@ -192,7 +193,9 @@ void ProgrammingSelectionWindow::on_configButton_clicked() | ||
| 192 | 193 | ||
| 193 | void ProgrammingSelectionWindow::on_helpButton_clicked() | 194 | void ProgrammingSelectionWindow::on_helpButton_clicked() |
| 194 | { | 195 | { |
| 195 | - | 196 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 197 | + dlg->showFullScreen(); | ||
| 198 | + dlg->raise(); | ||
| 196 | } | 199 | } |
| 197 | 200 | ||
| 198 | void ProgrammingSelectionWindow::on_okButton_clicked() | 201 | void ProgrammingSelectionWindow::on_okButton_clicked() |
app/gui/oven_control/programmingwindow.cpp
| @@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
| 11 | #include "soundplayer.h" | 11 | #include "soundplayer.h" |
| 12 | #include "confirmpopup.h" | 12 | #include "confirmpopup.h" |
| 13 | #include "programmingnamepopup.h" | 13 | #include "programmingnamepopup.h" |
| 14 | +#include "manualviewerdlg.h" | ||
| 14 | 15 | ||
| 15 | ProgrammingWindow::ProgrammingWindow(QWidget *parent) : | 16 | ProgrammingWindow::ProgrammingWindow(QWidget *parent) : |
| 16 | QMainWindow(parent), | 17 | QMainWindow(parent), |
| @@ -322,7 +323,9 @@ void ProgrammingWindow::on_saveButton_clicked() | @@ -322,7 +323,9 @@ void ProgrammingWindow::on_saveButton_clicked() | ||
| 322 | 323 | ||
| 323 | void ProgrammingWindow::on_helpButton_clicked() | 324 | void ProgrammingWindow::on_helpButton_clicked() |
| 324 | { | 325 | { |
| 325 | - | 326 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 327 | + dlg->showFullScreen(); | ||
| 328 | + dlg->raise(); | ||
| 326 | } | 329 | } |
| 327 | 330 | ||
| 328 | void ProgrammingWindow::onEncoderLeft() | 331 | void ProgrammingWindow::onEncoderLeft() |
app/gui/oven_control/realtimepartswindow.cpp
| @@ -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
| @@ -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
| @@ -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
| @@ -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 |
app/gui/oven_control/washwindow.cpp
| @@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
| 10 | #include "mainwindow.h" | 10 | #include "mainwindow.h" |
| 11 | #include "ovenstatics.h" | 11 | #include "ovenstatics.h" |
| 12 | #include "cooldownpopup.h" | 12 | #include "cooldownpopup.h" |
| 13 | +#include "manualviewerdlg.h" | ||
| 13 | 14 | ||
| 14 | WashWindow::WashWindow(QWidget *parent) : | 15 | WashWindow::WashWindow(QWidget *parent) : |
| 15 | QMainWindow(parent), | 16 | QMainWindow(parent), |
| @@ -517,7 +518,9 @@ void WashWindow::on_configButton_clicked() | @@ -517,7 +518,9 @@ void WashWindow::on_configButton_clicked() | ||
| 517 | 518 | ||
| 518 | void WashWindow::on_helpButton_clicked() | 519 | void WashWindow::on_helpButton_clicked() |
| 519 | { | 520 | { |
| 520 | - | 521 | + ManualViewerDlg* dlg = new ManualViewerDlg(this); |
| 522 | + dlg->showFullScreen(); | ||
| 523 | + dlg->raise(); | ||
| 521 | } | 524 | } |
| 522 | 525 | ||
| 523 | void WashWindow::onEncoderLeft() | 526 | void WashWindow::onEncoderLeft() |
files/manual/manual-01.png
684 KB
files/manual/manual-02.png
288 KB
files/manual/manual-03.png
1.02 MB
files/manual/manual-04.png
96.8 KB
files/manual/manual-05.png
137 KB
files/manual/manual-06.png
303 KB
files/manual/manual-07.png
317 KB
files/manual/manual-08.png
210 KB
files/manual/manual-09.png
265 KB
files/manual/manual-10.png
279 KB
files/manual/manual-11.png
1.16 MB
files/manual/manual-12.png
128 KB
files/manual/manual-13.png
352 KB
files/manual/manual-14.png
246 KB
files/manual/manual-15.png
316 KB
files/manual/manual-16.png
245 KB
files/manual/manual-17.png
278 KB
files/manual/manual-18.png
169 KB
files/manual/manual-19.png
312 KB
files/manual/manual-20.png
167 KB
files/manual/manual-21.png
221 KB
files/manual/manual-22.png
227 KB
files/manual/manual-23.png
299 KB
files/manual/manual-24.png
186 KB
files/manual/manual-25.png
186 KB
files/manual/manual-26.png
213 KB
files/manual/manual-27.png
220 KB
files/manual/manual-28.png
215 KB
files/manual/manual-29.png
205 KB
files/manual/manual-30.png
340 KB
files/manual/manual-31.png
333 KB
files/manual/manual-32.png
312 KB
files/manual/manual-33.png
326 KB
files/manual/manual-34.png
353 KB
files/manual/manual-35.png
218 KB
files/manual/manual-36.png
220 KB
files/manual/manual-37.png
291 KB
files/manual/manual-38.png
240 KB
files/manual/manual-39.png
218 KB
files/manual/manual-40.png
206 KB
files/manual/manual-41.png
231 KB
files/manual/manual-42.png
305 KB
files/manual/manual-43.png
170 KB
files/manual/manual-44.png
340 KB
files/manual/manual-45.png
297 KB
files/manual/manual-46.png
246 KB
files/manual/manual-47.png
288 KB
files/manual/manual-48.png
210 KB
files/manual/manual-49.png
1.26 MB
files/manual/manual-50.png
220 KB
files/manual/manual-51.png
205 KB
files/manual/manual-52.png
218 KB
files/manual/manual-53.png
226 KB
files/manual/manual-54.png
211 KB
files/manual/manual-55.png
226 KB
files/manual/manual-56.png
1.85 MB
files/manual/manual-57.png
136 KB
files/manual/manual-58.png
129 KB
files/manual/manual-59.png
200 KB
files/manual/manual-60.png
34.1 KB
kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi
| @@ -401,7 +401,8 @@ | @@ -401,7 +401,8 @@ | ||
| 401 | interrupt-parent = <&gpio6>; | 401 | interrupt-parent = <&gpio6>; |
| 402 | interrupts = <9 0>; | 402 | interrupts = <9 0>; |
| 403 | gpios = <&gpio6 9 0>; | 403 | gpios = <&gpio6 9 0>; |
| 404 | - ti,x-plate-ohms = <180>; | 404 | + ti,x-plate-ohms = <470>; |
| 405 | + ti,poll-period = <10>; | ||
| 405 | }; | 406 | }; |
| 406 | }; | 407 | }; |
| 407 | 408 |
kernel/linux-imx6_3.14.28/drivers/input/touchscreen/tsc2007.c
| @@ -170,13 +170,14 @@ static bool tsc2007_is_pen_down(struct tsc2007 *ts) | @@ -170,13 +170,14 @@ static bool tsc2007_is_pen_down(struct tsc2007 *ts) | ||
| 170 | return ts->get_pendown_state(&ts->client->dev); | 170 | return ts->get_pendown_state(&ts->client->dev); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | +#if 0 // Org [FALINUX] 2017.10.11 tsheaven@falinux.com | ||
| 173 | static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | 174 | static irqreturn_t tsc2007_soft_irq(int irq, void *handle) |
| 174 | { | 175 | { |
| 175 | struct tsc2007 *ts = handle; | 176 | struct tsc2007 *ts = handle; |
| 176 | struct input_dev *input = ts->input; | 177 | struct input_dev *input = ts->input; |
| 177 | struct ts_event tc; | 178 | struct ts_event tc; |
| 178 | u32 rt; | 179 | u32 rt; |
| 179 | - | 180 | + |
| 180 | while (!ts->stopped && tsc2007_is_pen_down(ts)) { | 181 | while (!ts->stopped && tsc2007_is_pen_down(ts)) { |
| 181 | 182 | ||
| 182 | /* pen is down, continue with the measurement */ | 183 | /* pen is down, continue with the measurement */ |
| @@ -212,6 +213,8 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | @@ -212,6 +213,8 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | ||
| 212 | * repeat at least once more the measurement. | 213 | * repeat at least once more the measurement. |
| 213 | */ | 214 | */ |
| 214 | dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt); | 215 | dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt); |
| 216 | + printk("-DOWN point(%4d,%4d), pressure (%4u), ts->max_rt(%d)\n", | ||
| 217 | + tc.x, tc.y, rt, ts->max_rt); | ||
| 215 | } | 218 | } |
| 216 | 219 | ||
| 217 | wait_event_timeout(ts->wait, ts->stopped, | 220 | wait_event_timeout(ts->wait, ts->stopped, |
| @@ -229,6 +232,93 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | @@ -229,6 +232,93 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | ||
| 229 | 232 | ||
| 230 | return IRQ_HANDLED; | 233 | return IRQ_HANDLED; |
| 231 | } | 234 | } |
| 235 | +#else // [FALINUX] 2017.10.11 tsheaven@falinux.com | ||
| 236 | +static irqreturn_t tsc2007_soft_irq(int irq, void *handle) | ||
| 237 | +{ | ||
| 238 | + struct tsc2007 *ts = handle; | ||
| 239 | + struct input_dev *input = ts->input; | ||
| 240 | + struct ts_event tc; | ||
| 241 | + struct ts_event tmp_tc; | ||
| 242 | + u32 rt; | ||
| 243 | + char first_read = 0; | ||
| 244 | + | ||
| 245 | + while (!ts->stopped && tsc2007_is_pen_down(ts)) { | ||
| 246 | + | ||
| 247 | + /* pen is down, continue with the measurement */ | ||
| 248 | + tsc2007_read_values(ts, &tc); | ||
| 249 | + | ||
| 250 | + rt = tsc2007_calculate_pressure(ts, &tc); | ||
| 251 | + | ||
| 252 | + switch ( first_read ) { | ||
| 253 | + case 0 : first_read = 1; | ||
| 254 | + continue; | ||
| 255 | + case 1 : first_read = 2; | ||
| 256 | + continue; | ||
| 257 | + case 2 : tmp_tc.x = tc.x; | ||
| 258 | + tmp_tc.y = tc.y; | ||
| 259 | + first_read = 3; | ||
| 260 | + break; | ||
| 261 | + case 3 : if( (rt < 150) || (rt > 700) ) { | ||
| 262 | + continue; | ||
| 263 | + } | ||
| 264 | + if( (abs(tmp_tc.x - tc.x) > 200) || (abs(tmp_tc.y - tc.y) > 200) ) { | ||
| 265 | + first_read = 0; | ||
| 266 | + continue; | ||
| 267 | + } | ||
| 268 | + break; | ||
| 269 | + } | ||
| 270 | + | ||
| 271 | + if (!rt && !ts->get_pendown_state) { | ||
| 272 | + /* | ||
| 273 | + * If pressure reported is 0 and we don't have | ||
| 274 | + * callback to check pendown state, we have to | ||
| 275 | + * assume that pen was lifted up. | ||
| 276 | + */ | ||
| 277 | + break; | ||
| 278 | + } | ||
| 279 | + | ||
| 280 | + if (rt <= ts->max_rt) { | ||
| 281 | + dev_dbg(&ts->client->dev, | ||
| 282 | + "DOWN point(%4d,%4d), pressure (%4u)\n", | ||
| 283 | + tc.x, tc.y, rt); | ||
| 284 | + | ||
| 285 | + input_report_key(input, BTN_TOUCH, 1); | ||
| 286 | + input_report_abs(input, ABS_X, tc.x); | ||
| 287 | + input_report_abs(input, ABS_Y, tc.y); | ||
| 288 | + input_report_abs(input, ABS_PRESSURE, rt); | ||
| 289 | + | ||
| 290 | + input_sync(input); | ||
| 291 | + | ||
| 292 | + } else { | ||
| 293 | + /* | ||
| 294 | + * Sample found inconsistent by debouncing or pressure is | ||
| 295 | + * beyond the maximum. Don't report it to user space, | ||
| 296 | + * repeat at least once more the measurement. | ||
| 297 | + */ | ||
| 298 | + dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt); | ||
| 299 | + printk("-DOWN point(%4d,%4d), pressure (%4u), ts->max_rt(%d)\n", | ||
| 300 | + tc.x, tc.y, rt, ts->max_rt); | ||
| 301 | + } | ||
| 302 | + | ||
| 303 | + tmp_tc.x = tc.x; | ||
| 304 | + tmp_tc.y = tc.y; | ||
| 305 | + | ||
| 306 | + wait_event_timeout(ts->wait, ts->stopped, | ||
| 307 | + msecs_to_jiffies(ts->poll_period)); | ||
| 308 | + } | ||
| 309 | + | ||
| 310 | + dev_dbg(&ts->client->dev, "UP\n"); | ||
| 311 | + | ||
| 312 | + input_report_key(input, BTN_TOUCH, 0); | ||
| 313 | + input_report_abs(input, ABS_PRESSURE, 0); | ||
| 314 | + input_sync(input); | ||
| 315 | + | ||
| 316 | + if (ts->clear_penirq) | ||
| 317 | + ts->clear_penirq(); | ||
| 318 | + | ||
| 319 | + return IRQ_HANDLED; | ||
| 320 | +} | ||
| 321 | +#endif | ||
| 232 | 322 | ||
| 233 | static irqreturn_t tsc2007_hard_irq(int irq, void *handle) | 323 | static irqreturn_t tsc2007_hard_irq(int irq, void *handle) |
| 234 | { | 324 | { |
release/imx6s-prime-oven.dtb
No preview for this file type
release/uImage
No preview for this file type