Don't force a whole layout map to be rasterised just because one

vector layer has non 100% opacity Rather, only rasterise this one layer and leave all the rest as vectors
qgis · Oct 19, 2020 · 2d15a4c · 2d15a4c
1 parent 572e017
commit 2d15a4c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -458,8 +458,6 @@ bool QgsLayoutItemMap::requiresRasterization() const
   if ( !containsAdvancedEffects() )
     return false;
 
-  // TODO layer transparency is probably ok to allow without forcing rasterization
-
   if ( hasBackground() && qgsDoubleNear( backgroundColor().alphaF(), 1.0 ) )
     return false;
 

diff --git a/src/core/qgsmapsettingsutils.cpp b/src/core/qgsmapsettingsutils.cpp
@@ -52,13 +52,8 @@ QStringList QgsMapSettingsUtils::containsAdvancedEffects( const QgsMapSettings &
         layers << layer->name();
       }
       // if vector layer, check labels and feature blend mode
-      QgsVectorLayer *currentVectorLayer = qobject_cast<QgsVectorLayer *>( layer );
-      if ( currentVectorLayer )
+      if ( QgsVectorLayer *currentVectorLayer = qobject_cast<QgsVectorLayer *>( layer ) )
       {
-        if ( !qgsDoubleNear( currentVectorLayer->opacity(), 1.0 ) && !( flags & EffectsCheckFlag::IgnoreGeoPdfSupportedEffects ) )
-        {
-          layers << layer->name();
-        }
         if ( currentVectorLayer->featureBlendMode() != QPainter::CompositionMode_SourceOver )
         {
           layers << layer->name();

diff --git a/tests/src/core/testqgsmapsettingsutils.cpp b/tests/src/core/testqgsmapsettingsutils.cpp
@@ -93,8 +93,10 @@ void TestQgsMapSettingsUtils::containsAdvancedEffects()
   QCOMPARE( QgsMapSettingsUtils::containsAdvancedEffects( mapSettings ).size(), 0 );
   QCOMPARE( QgsMapSettingsUtils::containsAdvancedEffects( mapSettings, QgsMapSettingsUtils::EffectsCheckFlag::IgnoreGeoPdfSupportedEffects ).size(), 0 );
 
+  // changing an individual layer's opacity is OK -- we don't want to force the whole map to be rasterised just because of this setting!
+  // (just let that one layer get exported as raster instead)
   layer->setOpacity( 0.5 );
-  QCOMPARE( QgsMapSettingsUtils::containsAdvancedEffects( mapSettings ).size(), 1 );
+  QCOMPARE( QgsMapSettingsUtils::containsAdvancedEffects( mapSettings ).size(), 0 );
   QCOMPARE( QgsMapSettingsUtils::containsAdvancedEffects( mapSettings, QgsMapSettingsUtils::EffectsCheckFlag::IgnoreGeoPdfSupportedEffects ).size(), 0 );
 }