sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-26 00:08:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply featureFilterProvider in QgsVectorLayerDiagramProvider

Browse Source
This commit is contained in:
arnaud.morvan@camptocamp.com 2019-01-08 14:18:02 +01:00
parent 948048cd4d
commit a222906fcf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/qgsmaprendererjob.cpp
View File

@ -358,6 +358,7 @@ LabelRenderJob QgsMapRendererJob::prepareLabelingJob( QPainter *painter, QgsLabe
job.context.setPainter( painter ); job.context.setPainter( painter );
job.context.setLabelingEngine( labelingEngine2 ); job.context.setLabelingEngine( labelingEngine2 );
job.context.setExtent( mSettings.visibleExtent() ); job.context.setExtent( mSettings.visibleExtent() );
job.context.setFeatureFilterProvider( mFeatureFilterProvider );
// if we can use the cache, let's do it and avoid rendering! // if we can use the cache, let's do it and avoid rendering!
bool hasCache = canUseLabelCache && mCache && mCache->hasCacheImage( LABEL_CACHE_ID ); bool hasCache = canUseLabelCache && mCache && mCache->hasCacheImage( LABEL_CACHE_ID );

6
src/core/qgsvectorlayerdiagramprovider.cpp
View File

@ -78,9 +78,13 @@ QList<QgsLabelFeature *> QgsVectorLayerDiagramProvider::labelFeatures( QgsRender
QgsFeatureRequest request; QgsFeatureRequest request;
request.setFilterRect( layerExtent ); request.setFilterRect( layerExtent );
request.setSubsetOfAttributes( attributeNames, mFields ); request.setSubsetOfAttributes( attributeNames, mFields );
const QgsFeatureFilterProvider *featureFilterProvider = context.featureFilterProvider();
if ( featureFilterProvider )
{
featureFilterProvider->filterFeatures( qobject_cast<QgsVectorLayer *>( mLayer ), request );
}
QgsFeatureIterator fit = mSource->getFeatures( request ); QgsFeatureIterator fit = mSource->getFeatures( request );
QgsFeature fet; QgsFeature fet;
while ( fit.nextFeature( fet ) ) while ( fit.nextFeature( fet ) )
{ {