Merge pull request #43144 from nirvn/external_resource_image_fix

External resource image fixes
qgis · May 10, 2021 · e2e469d · e2e469d
2 parents 1b69cef + d3fa9cb
commit e2e469d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/python/gui/auto_generated/qgspixmaplabel.sip.in b/python/gui/auto_generated/qgspixmaplabel.sip.in
@@ -45,9 +45,16 @@ determined from the width with the given aspect ratio.
 %End
 
   public slots:
+
     void setPixmap( const QPixmap & );
     virtual void resizeEvent( QResizeEvent * );
 
+
+    void clear();
+%Docstring
+Clears any label contents.
+%End
+
 };
 
 /************************************************************************

diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp b/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp
@@ -249,7 +249,6 @@ void QgsExternalResourceWidgetWrapper::updateValues( const QVariant &value, cons
       mQgsWidget->setDocumentPath( value.toString() );
     }
   }
-
 }
 
 void QgsExternalResourceWidgetWrapper::setEnabled( bool enabled )

diff --git a/src/gui/qgsexternalresourcewidget.cpp b/src/gui/qgsexternalresourcewidget.cpp
@@ -245,9 +245,13 @@ void QgsExternalResourceWidget::loadDocument( const QString &path )
       ir.setAutoTransform( true );
       QPixmap pm = QPixmap::fromImage( ir.read() );
       if ( !pm.isNull() )
+      {
         mPixmapLabel->setPixmap( pm );
+      }
       else
+      {
         mPixmapLabel->clear();
+      }
       updateDocumentViewer();
     }
   }

diff --git a/src/gui/qgspixmaplabel.cpp b/src/gui/qgspixmaplabel.cpp
@@ -32,8 +32,7 @@ void QgsPixmapLabel::setPixmap( const QPixmap &p )
     updateGeometry();
   }
 
-  QLabel::setPixmap( mPixmap.scaled( this->size(),
-                                     Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
+  QLabel::setPixmap( mPixmap.scaled( this->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
 }
 
 int QgsPixmapLabel::heightForWidth( int width ) const
@@ -56,6 +55,15 @@ QSize QgsPixmapLabel::sizeHint() const
 void QgsPixmapLabel::resizeEvent( QResizeEvent *e )
 {
   QLabel::resizeEvent( e );
-  QLabel::setPixmap( mPixmap.scaled( this->size(),
-                                     Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
+  if ( !mPixmap.isNull() )
+  {
+    // Avoid infinite resize loop by setting a pixmap that'll always have a width and height less or equal to the label size
+    QLabel::setPixmap( mPixmap.scaled( this->size() -= QSize( 1, 1 ), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
+  }
+}
+
+void QgsPixmapLabel::clear()
+{
+  mPixmap = QPixmap();
+  QLabel::clear();
 }
diff --git a/src/gui/qgspixmaplabel.h b/src/gui/qgspixmaplabel.h
@@ -50,9 +50,15 @@ class GUI_EXPORT QgsPixmapLabel : public QLabel
     QSize sizeHint() const override;
 
   public slots:
+
     void setPixmap( const QPixmap & );
     void resizeEvent( QResizeEvent * ) override;
+
+    //! Clears any label contents.
+    void clear();
+
   private:
+
     QPixmap mPixmap;
 };