diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/widgets/imageviewer | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/widgets/imageviewer')
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 15 | ||||
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.h | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 327abf7e43..2fc8ff63de 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -48,6 +48,8 @@ ** ****************************************************************************/ +#include "imageviewer.h" + #include <QtWidgets> #if defined(QT_PRINTSUPPORT_LIB) #include <QtPrintSupport/qtprintsupportglobal.h> @@ -56,13 +58,10 @@ #endif #endif -#include "imageviewer.h" - //! [0] -ImageViewer::ImageViewer() - : imageLabel(new QLabel) - , scrollArea(new QScrollArea) - , scaleFactor(1) +ImageViewer::ImageViewer(QWidget *parent) + : QMainWindow(parent), imageLabel(new QLabel), + scrollArea(new QScrollArea), scaleFactor(1) { imageLabel->setBackgroundRole(QPalette::Base); imageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); @@ -107,6 +106,8 @@ bool ImageViewer::loadFile(const QString &fileName) void ImageViewer::setImage(const QImage &newImage) { image = newImage; + if (image.colorSpace().isValid()) + image.convertToColorSpace(QColorSpace::SRgb); imageLabel->setPixmap(QPixmap::fromImage(image)); //! [4] scaleFactor = 1.0; @@ -152,7 +153,7 @@ static void initializeImageFileDialog(QFileDialog &dialog, QFileDialog::AcceptMo QStringList mimeTypeFilters; const QByteArrayList supportedMimeTypes = acceptMode == QFileDialog::AcceptOpen ? QImageReader::supportedMimeTypes() : QImageWriter::supportedMimeTypes(); - foreach (const QByteArray &mimeTypeName, supportedMimeTypes) + for (const QByteArray &mimeTypeName : supportedMimeTypes) mimeTypeFilters.append(mimeTypeName); mimeTypeFilters.sort(); dialog.setMimeTypeFilters(mimeTypeFilters); diff --git a/examples/widgets/widgets/imageviewer/imageviewer.h b/examples/widgets/widgets/imageviewer/imageviewer.h index f4a62cafe9..7e53105b33 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.h +++ b/examples/widgets/widgets/imageviewer/imageviewer.h @@ -71,7 +71,7 @@ class ImageViewer : public QMainWindow Q_OBJECT public: - ImageViewer(); + ImageViewer(QWidget *parent = nullptr); bool loadFile(const QString &); private slots: |