From 4a6bf58c57f3801424e77dfe660f24a5a696bf36 Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 29 Sep 2017 11:11:19 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8F=84=EC=9B=80=EB=A7=90=20=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20=EB=94=94=EB=B2=84=EA=B9=85=20=20-=20=ED=95=AD?= =?UTF-8?q?=EC=83=81=2010=ED=8E=98=EC=9D=B4=EC=A7=80=EB=B6=80=ED=84=B0=20?= =?UTF-8?q?=EB=B3=B4=EC=97=AC=EC=A3=BC=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=20-=20=EC=9E=90=EB=8F=99=20=EC=9A=94?= =?UTF-8?q?=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=99=80=20=EC=88=98?= =?UTF-8?q?=EB=8F=99=20=EC=9A=94=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EB=92=A4=EB=B0=94=EB=80=90=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/manualviewerdlg.cpp | 3 --- app/gui/oven_control/manualviewerdlg.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/gui/oven_control/manualviewerdlg.cpp b/app/gui/oven_control/manualviewerdlg.cpp index db56179..d371493 100644 --- a/app/gui/oven_control/manualviewerdlg.cpp +++ b/app/gui/oven_control/manualviewerdlg.cpp @@ -14,9 +14,6 @@ ManualViewerDlg::ManualViewerDlg(QWidget *parent, uint32_t start) : m_nCurPage = start; if(m_nCurPage<1 || m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1; - - m_nCurPage =10; - //ui->ctrLbManual->setScaledContents(true); QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0'))); ui->ctrLbManual->setPixmap(image); diff --git a/app/gui/oven_control/manualviewerdlg.h b/app/gui/oven_control/manualviewerdlg.h index 3d0e8c9..bee82b2 100644 --- a/app/gui/oven_control/manualviewerdlg.h +++ b/app/gui/oven_control/manualviewerdlg.h @@ -3,14 +3,14 @@ #include -#define MAX_MANUAL_PAGE 60 -#define START_X 0 -#define START_Y 0 -#define SIZE_WIDTH 900 -#define SIZE_HEIGHT 1450 - -#define AUTO_COOK_PAGE 30 -#define MANUAL_COOK_PAGE 36 +#define MAX_MANUAL_PAGE 60 +#define START_X 0 +#define START_Y 0 +#define SIZE_WIDTH 900 +#define SIZE_HEIGHT 1450 + +#define AUTO_COOK_PAGE 36 +#define MANUAL_COOK_PAGE 30 namespace Ui { class ManualViewerDlg; -- 2.1.4