jgrewe/PylonRecorder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[qt] remove deprecated pixmap calls

Browse Source
This commit is contained in:
Jan Grewe 2024-03-14 11:17:44 +01:00
parent f803854da3
commit fe20326953
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pylonrecorder.cpp
View File

@ -280,8 +280,8 @@ void PylonRecorder::saveAs() {
void PylonRecorder::print() { void PylonRecorder::print() {
QPixmap map = imageLabel->pixmap(Qt::ReturnByValue); const QPixmap *map = imageLabel->pixmap();
Q_ASSERT(!map.isNull()); Q_ASSERT(!map->isNull());
#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog) #if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
QPrintDialog dialog(&printer, this); QPrintDialog dialog(&printer, this);
@ -289,11 +289,11 @@ void PylonRecorder::print() {
if (dialog.exec()) { if (dialog.exec()) {
QPainter painter(&printer); QPainter painter(&printer);
QRect rect = painter.viewport(); QRect rect = painter.viewport();
QSize size = map.size(); QSize size = map->size();
size.scale(rect.size(), Qt::KeepAspectRatio); size.scale(rect.size(), Qt::KeepAspectRatio);
painter.setViewport(rect.x(), rect.y(), size.width(), size.height()); painter.setViewport(rect.x(), rect.y(), size.width(), size.height());
painter.setWindow(map.rect()); painter.setWindow(map->rect());
painter.drawPixmap(0, 0, map); painter.drawPixmap(0, 0, *map);
} }
#endif #endif
} }
@ -570,10 +570,10 @@ void PylonRecorder::cameraIDAccepted() {
} }
void PylonRecorder::scaleImage(double factor) { void PylonRecorder::scaleImage(double factor) {
QPixmap map = imageLabel->pixmap(Qt::ReturnByValue); const QPixmap *map = imageLabel->pixmap();
Q_ASSERT(!map.isNull()); Q_ASSERT(!map->isNull());
scaleFactor *= factor; scaleFactor *= factor;
imageLabel->resize(scaleFactor * map.size()); imageLabel->resize(scaleFactor * map->size());
adjustScrollBar(scrollArea->horizontalScrollBar(), factor); adjustScrollBar(scrollArea->horizontalScrollBar(), factor);
adjustScrollBar(scrollArea->verticalScrollBar(), factor); adjustScrollBar(scrollArea->verticalScrollBar(), factor);
@ -584,7 +584,7 @@ void PylonRecorder::scaleImage(double factor) {
void PylonRecorder::applyScaling(){ void PylonRecorder::applyScaling(){
imageLabel->resize(scaleFactor * imageLabel->pixmap(Qt::ReturnByValue).size()); imageLabel->resize(scaleFactor * imageLabel->pixmap()->size());
} }