filter features when exporting atlas image and filter is enabled

qgis · Aug 2, 2021 · 13515ec · 13515ec
1 parent 8d8b247
commit 13515ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/analysis/processing/qgsalgorithmlayoutatlastoimage.cpp b/src/analysis/processing/qgsalgorithmlayoutatlastoimage.cpp
@@ -141,10 +141,13 @@ QVariantMap QgsLayoutAtlasToImageAlgorithm::processAlgorithm( const QVariantMap
 
     expression = parameterAsString( parameters, QStringLiteral( "FILTER_EXPRESSION" ), context );
     atlas->setFilterExpression( expression, error );
+    atlas->setFilterFeatures( !expression.isEmpty() && error.isEmpty() );
+
     if ( !expression.isEmpty() && !error.isEmpty() )
     {
       throw QgsProcessingException( QObject::tr( "Error setting atlas filter expression" ) );
     }
+
     error.clear();
 
     expression = parameterAsString( parameters, QStringLiteral( "SORTBY_EXPRESSION" ), context );

diff --git a/src/core/layout/qgslayoutatlas.cpp b/src/core/layout/qgslayoutatlas.cpp
@@ -297,7 +297,7 @@ int QgsLayoutAtlas::updateFeatures()
 
   QgsFeatureIterator fit = mCoverageLayer->getFeatures( req );
 
-  std::unique_ptr<QgsExpression> nameExpression;
+   std::unique_ptr<QgsExpression> nameExpression;
   if ( !mPageNameExpression.isEmpty() )
   {
     nameExpression = std::make_unique< QgsExpression >( mPageNameExpression );
@@ -384,12 +384,17 @@ bool QgsLayoutAtlas::beginRender()
     //no matching features found
     return false;
   }
+  if ( !mFilterExpression.isEmpty() )
+      mCoverageLayer->setSubsetString( mFilterExpression );
 
   return true;
 }
 
 bool QgsLayoutAtlas::endRender()
 {
+  if ( mCoverageLayer && !mFilterExpression.isEmpty() )
+      mCoverageLayer->setSubsetString( QString() );
+
   emit featureChanged( QgsFeature() );
   emit renderEnded();
   return true;