[layouts] When determining whether a layout requires rasterization

in order to export correctly, skip over any items which aren't visible These don't affect the output in any way, so showing warnings about forced rasterization is misleading
qgis · May 6, 2021 · 6a9133c · 6a9133c
1 parent 5eb2d72
commit 6a9133c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -1926,7 +1926,8 @@ bool QgsLayoutExporter::requiresRasterization( const QgsLayout *layout )
 
   for ( QgsLayoutItem *currentItem : std::as_const( items ) )
   {
-    if ( currentItem->requiresRasterization() )
+    // ignore invisible items, they won't affect the output in any way...
+    if ( currentItem->isVisible() && currentItem->requiresRasterization() )
       return true;
   }
   return false;
@@ -1942,7 +1943,8 @@ bool QgsLayoutExporter::containsAdvancedEffects( const QgsLayout *layout )
 
   for ( QgsLayoutItem *currentItem : std::as_const( items ) )
   {
-    if ( currentItem->containsAdvancedEffects() )
+    // ignore invisible items, they won't affect the output in any way...
+    if ( currentItem->isVisible() && currentItem->containsAdvancedEffects() )
       return true;
   }
   return false;

diff --git a/tests/src/python/test_qgslayoutexporter.py b/tests/src/python/test_qgslayoutexporter.py
@@ -1128,6 +1128,10 @@ def testRequiresRasterization(self):
         label.setBlendMode(QPainter.CompositionMode_Overlay)
         self.assertTrue(QgsLayoutExporter.requiresRasterization(l))
 
+        # but if the item is NOT visible, it won't affect the output in any way..
+        label.setVisibility(False)
+        self.assertFalse(QgsLayoutExporter.requiresRasterization(l))
+
     def testContainsAdvancedEffects(self):
         """
         Test QgsLayoutExporter.containsAdvancedEffects
@@ -1146,6 +1150,10 @@ def testContainsAdvancedEffects(self):
         label.setItemOpacity(0.5)
         self.assertTrue(QgsLayoutExporter.containsAdvancedEffects(l))
 
+        # but if the item is NOT visible, it won't affect the output in any way..
+        label.setVisibility(False)
+        self.assertFalse(QgsLayoutExporter.containsAdvancedEffects(l))
+
 
 if __name__ == '__main__':
     unittest.main()