From 7c72270099b232502721325efc8e45d7deb9666d Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 3 Apr 2017 16:34:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=B8=EC=B2=99=20=EA=B3=B5=EC=A0=95=20?= =?UTF-8?q?=EB=8B=A8=EA=B3=84=20=EA=B2=8C=EC=9D=B4=EC=A7=80=20=EB=B0=94=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/oven_control.pro | 6 ++++-- app/gui/oven_control/preheattempgauge.h | 2 +- app/gui/oven_control/washstepgauge.cpp | 6 ++++++ app/gui/oven_control/washstepgauge.h | 12 ++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 app/gui/oven_control/washstepgauge.cpp create mode 100644 app/gui/oven_control/washstepgauge.h diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index 861ba3b..3c2d61d 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -38,7 +38,8 @@ SOURCES += main.cpp\ heatcirculargauge.cpp \ preheattempgauge.cpp \ autocookconfigwindow.cpp \ - washwindow.cpp + washwindow.cpp \ + washstepgauge.cpp HEADERS += mainwindow.h \ cook.h \ @@ -65,7 +66,8 @@ HEADERS += mainwindow.h \ heatcirculargauge.h \ preheattempgauge.h \ autocookconfigwindow.h \ - washwindow.h + washwindow.h \ + washstepgauge.h FORMS += mainwindow.ui \ manualcookwindow.ui \ diff --git a/app/gui/oven_control/preheattempgauge.h b/app/gui/oven_control/preheattempgauge.h index ae7da12..56436c5 100644 --- a/app/gui/oven_control/preheattempgauge.h +++ b/app/gui/oven_control/preheattempgauge.h @@ -20,7 +20,7 @@ public slots: protected: void paintEvent(QPaintEvent *event); -private: +protected: QPixmap body; QPixmap border; QPixmap indicator; diff --git a/app/gui/oven_control/washstepgauge.cpp b/app/gui/oven_control/washstepgauge.cpp new file mode 100644 index 0000000..4f87e44 --- /dev/null +++ b/app/gui/oven_control/washstepgauge.cpp @@ -0,0 +1,6 @@ +#include "washstepgauge.h" + +WashStepGauge::WashStepGauge(QWidget *parent) : PreheatTempGauge(parent) +{ + body.load(":/images/images/auto/graphe_hit_03.png"); +} diff --git a/app/gui/oven_control/washstepgauge.h b/app/gui/oven_control/washstepgauge.h new file mode 100644 index 0000000..1efd04d --- /dev/null +++ b/app/gui/oven_control/washstepgauge.h @@ -0,0 +1,12 @@ +#ifndef WASHSTEPGAUGE_H +#define WASHSTEPGAUGE_H + +#include "preheattempgauge.h" + +class WashStepGauge : public PreheatTempGauge +{ +public: + WashStepGauge(QWidget *parent = 0); +}; + +#endif // WASHSTEPGAUGE_H -- 2.1.4