메뉴얼 화면 속도 개선

- 이미지 사이즈 축소 - 스케일 사용 삭제

메뉴얼 화면 속도 개선
- 이미지 사이즈 축소 - 스케일 사용 삭제
고영탁
1 parent cf095bd105
Showing 61 changed files with 8 additions and 3 deletions Show diff stats
app/gui/oven_control/manualviewerdlg.cpp
files/manual/manual-01.png
files/manual/manual-02.png
files/manual/manual-03.png
files/manual/manual-04.png
files/manual/manual-05.png
files/manual/manual-06.png
files/manual/manual-07.png
files/manual/manual-08.png
files/manual/manual-09.png
files/manual/manual-10.png
files/manual/manual-11.png
files/manual/manual-12.png
files/manual/manual-13.png
files/manual/manual-14.png
files/manual/manual-15.png
files/manual/manual-16.png
files/manual/manual-17.png
files/manual/manual-18.png
files/manual/manual-19.png
@@ -19,7 +19,7 @@ ManualViewerDlg::ManualViewerDlg(QWidget *parent, uint32_t start) :
  
     //ui->ctrLbManual->setScaledContents(true);
     QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
-    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    ui->ctrLbManual->setPixmap(image);
 }
  
 ManualViewerDlg::~ManualViewerDlg()
@@ -37,7 +37,8 @@ void ManualViewerDlg::on_leftButton_clicked()
     m_nCurPage--;
     if(m_nCurPage<1) m_nCurPage=MAX_MANUAL_PAGE;
     QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
-    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    ui->ctrLbManual->setPixmap(image);
+    //ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
 }
  
  
@@ -47,5 +48,9 @@ void ManualViewerDlg::on_rightButton_clicked()
     m_nCurPage++;
     if(m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1;
     QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
-    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
+//    QPixmap scale = image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation);
+//    qDebug() << image.size();
+//    qDebug() << scale.size();
+//    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    ui->ctrLbManual->setPixmap(image);
 }
...	...	@@ -19,7 +19,7 @@ ManualViewerDlg::ManualViewerDlg(QWidget *parent, uint32_t start) :
19	19
20	20	//ui->ctrLbManual->setScaledContents(true);
21	21	QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
22		- ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
	22	+ ui->ctrLbManual->setPixmap(image);
23	23	}
24	24
25	25	ManualViewerDlg::~ManualViewerDlg()
...	...	@@ -37,7 +37,8 @@ void ManualViewerDlg::on_leftButton_clicked()
37	37	m_nCurPage--;
38	38	if(m_nCurPage<1) m_nCurPage=MAX_MANUAL_PAGE;
39	39	QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
40		- ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
	40	+ ui->ctrLbManual->setPixmap(image);
	41	+ //ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
41	42	}
42	43
43	44
...	...	@@ -47,5 +48,9 @@ void ManualViewerDlg::on_rightButton_clicked()
47	48	m_nCurPage++;
48	49	if(m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1;
49	50	QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
50		- ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
	51	+// QPixmap scale = image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation);
	52	+// qDebug() << image.size();
	53	+// qDebug() << scale.size();
	54	+// ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
	55	+ ui->ctrLbManual->setPixmap(image);
51	56	}
...	...