Merge pull request qgis#54692 from elpaso/bugfix-gh8155-atlas-legend-…

…support-clipping ATLAS: LEGEND support clipping
ltg1710 · Sep 26, 2023 · 096d741 · 096d741
2 parents 5d497bc + bbfefcf
commit 096d741
Show file tree

Hide file tree

Showing 4 changed files with 1,477 additions and 3 deletions.
diff --git a/src/core/layout/qgslayoutitemlegend.cpp b/src/core/layout/qgslayoutitemlegend.cpp
@@ -1133,14 +1133,29 @@ void QgsLayoutItemLegend::doUpdateFilterByMap()
 
     mapSettings.setExpressionContext( createExpressionContext() );
 
-    const QgsGeometry atlasGeometry = mInAtlas ? mLayout->reportContext().currentGeometry( mapSettings.destinationCrs() ) : QgsGeometry();
+    const QgsGeometry atlasGeometry { mLayout->reportContext().currentGeometry( mapSettings.destinationCrs() ) };
 
     QgsLayerTreeFilterSettings filterSettings( mapSettings );
 
+    QList<QgsMapLayer *> layersToClip;
+    if ( !atlasGeometry.isNull() && mMap->atlasClippingSettings()->enabled() )
+    {
+      layersToClip = mMap->atlasClippingSettings()->layersToClip();
+      for ( QgsMapLayer *layer : std::as_const( layersToClip ) )
+      {
+        QList<QgsMapLayer *> mapLayers { filterSettings.mapSettings().layers( true ) };
+        mapLayers.removeAll( layer );
+        filterSettings.mapSettings().setLayers( mapLayers );
+        filterSettings.addVisibleExtentForLayer( layer, QgsReferencedGeometry( atlasGeometry, mapSettings.destinationCrs() ) );
+      }
+    }
+
+
     if ( !linkedFilterMaps.empty() )
     {
       for ( QgsLayoutItemMap *map : std::as_const( linkedFilterMaps ) )
       {
+
         if ( map == mMap )
           continue;
 
@@ -1160,7 +1175,7 @@ void QgsLayoutItemLegend::doUpdateFilterByMap()
         const QList< QgsMapLayer * > layersForMap = map->layersToRender();
         for ( QgsMapLayer *layer : layersForMap )
         {
-          if ( !atlasGeometry.isNull() )
+          if ( mInAtlas && !atlasGeometry.isNull() )
           {
             mapExtent = mapExtent.intersection( atlasGeometry );
           }

diff --git a/tests/src/python/test_qgslayoutlegend.py b/tests/src/python/test_qgslayoutlegend.py
@@ -49,7 +49,8 @@
     QgsSymbol,
     QgsVectorLayer,
     QgsReadWriteContext,
-    QgsTextFormat
+    QgsTextFormat,
+    QgsFeatureRequest,
 )
 import unittest
 from qgis.testing import start_app, QgisTestCase
@@ -1131,6 +1132,36 @@ def test_filter_by_map_content_rendering_different_layers(self):
             )
         )
 
+    def test_atlas_legend_clipping(self):
+        """Test issue GH #54654"""
+
+        p = QgsProject()
+        self.assertTrue(p.read(os.path.join(TEST_DATA_DIR, 'layouts', 'atlas_legend_clipping.qgs')))
+
+        layout = p.layoutManager().layoutByName('layout1')
+
+        layer = list(p.mapLayers().values())[0]
+        feature = layer.getFeature(3)
+        req = QgsFeatureRequest()
+        req.setFilterExpression('value = 11')
+        feature = next(layer.getFeatures(req))
+
+        layout.reportContext().setFeature(feature)
+        legend = layout.items()[0]
+        legend.setStyleFont(QgsLegendStyle.Title, QgsFontUtils.getStandardTestFont('Bold', 20))
+        legend.setStyleFont(QgsLegendStyle.Group, QgsFontUtils.getStandardTestFont('Bold', 20))
+        legend.setStyleFont(QgsLegendStyle.Subgroup, QgsFontUtils.getStandardTestFont('Bold', 20))
+        legend.setStyleFont(QgsLegendStyle.Symbol, QgsFontUtils.getStandardTestFont('Bold', 20))
+        legend.setStyleFont(QgsLegendStyle.SymbolLabel,
+                            QgsFontUtils.getStandardTestFont('Bold', 20))
+        legend.refresh()
+
+        self.assertTrue(
+            self.render_layout_check(
+                'atlas_legend_clipping', layout
+            )
+        )
+
     def test_filter_by_map_content_rendering_different_layers_in_atlas(self):
         point_path = os.path.join(TEST_DATA_DIR, 'points.shp')
         point_layer = QgsVectorLayer(point_path, 'points', 'ogr')

diff --git a/...mposer_legend/expected_atlas_legend_clipping/expected_atlas_legend_clipping.png b/...mposer_legend/expected_atlas_legend_clipping/expected_atlas_legend_clipping.png