Fix elevation profile item transparency forces rasterisation of

whole layout, expand unit test coverage
qgis · Oct 11, 2023 · df1dc0d · df1dc0d
1 parent 3588d41
commit df1dc0d
Show file tree

Hide file tree

Showing 11 changed files with 360 additions and 15 deletions.
diff --git a/python/core/auto_generated/layout/qgslayoutitemelevationprofile.sip.in b/python/core/auto_generated/layout/qgslayoutitemelevationprofile.sip.in
@@ -44,6 +44,10 @@ The caller takes responsibility for deleting the returned object.
 
     virtual QgsLayoutItem::Flags itemFlags() const;
 
+    virtual bool requiresRasterization() const;
+
+    virtual bool containsAdvancedEffects() const;
+
 
     Qgs2DPlot *plot();
 %Docstring
@@ -177,6 +181,15 @@ Sets the ``unit`` for the distance axis.
     virtual void invalidateCache();
 
 
+  signals:
+
+    void previewRefreshed();
+%Docstring
+Emitted whenever the item's preview has been refreshed.
+
+.. versionadded:: 3.34
+%End
+
   protected:
     virtual void draw( QgsLayoutItemRenderContext &context );
 

diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h
@@ -1367,6 +1367,7 @@ class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectIt
     friend class QgsLayoutItemGroup;
     friend class QgsLayoutItemMap;
     friend class QgsLayoutItemLegend;
+    friend class QgsLayoutItemElevationProfile;
     friend class QgsCompositionConverter;
 };
 

diff --git a/src/core/layout/qgslayoutitemelevationprofile.cpp b/src/core/layout/qgslayoutitemelevationprofile.cpp
@@ -449,6 +449,16 @@ QgsLayoutItem::Flags QgsLayoutItemElevationProfile::itemFlags() const
   return QgsLayoutItem::FlagOverridesPaint;
 }
 
+bool QgsLayoutItemElevationProfile::requiresRasterization() const
+{
+  return blendMode() != QPainter::CompositionMode_SourceOver;
+}
+
+bool QgsLayoutItemElevationProfile::containsAdvancedEffects() const
+{
+  return mEvaluatedOpacity < 1.0;
+}
+
 Qgs2DPlot *QgsLayoutItemElevationProfile::plot()
 {
   return mPlot.get();
@@ -920,6 +930,7 @@ void QgsLayoutItemElevationProfile::profileGenerationFinished()
   mCacheFinalImage = std::move( mCacheRenderingImage );
   emit backgroundTaskCountChanged( 0 );
   update();
+  emit previewRefreshed();
 }
 
 Qgis::DistanceUnit QgsLayoutItemElevationProfile::distanceUnit() const

diff --git a/src/core/layout/qgslayoutitemelevationprofile.h b/src/core/layout/qgslayoutitemelevationprofile.h
@@ -55,6 +55,8 @@ class CORE_EXPORT QgsLayoutItemElevationProfile: public QgsLayoutItem
     QIcon icon() const override;
     void refreshDataDefinedProperty( QgsLayoutObject::DataDefinedProperty property = QgsLayoutObject::AllProperties ) override;
     QgsLayoutItem::Flags itemFlags() const override;
+    bool requiresRasterization() const override;
+    bool containsAdvancedEffects() const override;
 
     /**
      * Returns a reference to the elevation plot object, which can be used to
@@ -188,6 +190,15 @@ class CORE_EXPORT QgsLayoutItemElevationProfile: public QgsLayoutItem
     void refresh() override;
     void invalidateCache() override;
 
+  signals:
+
+    /**
+     * Emitted whenever the item's preview has been refreshed.
+     *
+     * \since QGIS 3.34
+     */
+    void previewRefreshed();
+
   protected:
     void draw( QgsLayoutItemRenderContext &context ) override;
     bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const override;