sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

ATLAS: LEGEND support clipping

Browse Source 
Fix #8155
This commit is contained in:
Alessandro Pasotti 2023-09-21 17:32:42 +02:00
parent e5e6a13671
commit d156fbabfc
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/layout/qgslayoutitemlegend.cpp
View File

@ -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 );
}