Commit 4a6bf58c57f3801424e77dfe660f24a5a696bf36
1 parent
c03c0ecca5
Exists in
master
and in
2 other branches
도움말 보기 디버깅
- 항상 10페이지부터 보여주는 문제 수정 - 자동 요리 페이지와 수동 요리 페이지가 뒤바뀐 문제 수정
Showing
2 changed files
with
8 additions
and
11 deletions
Show diff stats
app/gui/oven_control/manualviewerdlg.cpp
| ... | ... | @@ -14,9 +14,6 @@ ManualViewerDlg::ManualViewerDlg(QWidget *parent, uint32_t start) : |
| 14 | 14 | m_nCurPage = start; |
| 15 | 15 | if(m_nCurPage<1 || m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1; |
| 16 | 16 | |
| 17 | - | |
| 18 | - m_nCurPage =10; | |
| 19 | - | |
| 20 | 17 | //ui->ctrLbManual->setScaledContents(true); |
| 21 | 18 | QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0'))); |
| 22 | 19 | ui->ctrLbManual->setPixmap(image); | ... | ... |
app/gui/oven_control/manualviewerdlg.h
| ... | ... | @@ -3,14 +3,14 @@ |
| 3 | 3 | |
| 4 | 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 30 | |
| 13 | -#define MANUAL_COOK_PAGE 36 | |
| 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 | 14 | |
| 15 | 15 | namespace Ui { |
| 16 | 16 | class ManualViewerDlg; | ... | ... |