Skip to content

Commit

Permalink
Optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
pblottiere committed Oct 15, 2020
1 parent ece1dfa commit a25a561
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/gui/qgsmaptip.cpp
Expand Up @@ -217,11 +217,13 @@ QString QgsMapTip::fetchFeature( QgsMapLayer *layer, QgsPointXY &mapPosition, Qg
QgsRenderContext renderCtx = QgsRenderContext::fromMapSettings( mapCanvas->mapSettings() );
renderCtx.expressionContext() << QgsExpressionContextUtils::layerScope( vlayer );

bool filter = false;
std::unique_ptr< QgsFeatureRenderer > renderer;
if ( vlayer->renderer() )
{
renderer.reset( vlayer->renderer()->clone() );
renderer->startRender( renderCtx, vlayer->fields() );
filter = renderer->capabilities() & QgsFeatureRenderer::Filter;
}

QgsFeatureIterator it = vlayer->getFeatures( request );
Expand All @@ -232,7 +234,7 @@ QString QgsMapTip::fetchFeature( QgsMapLayer *layer, QgsPointXY &mapPosition, Qg
context.setFeature( feature );

renderCtx.expressionContext().setFeature( feature );
if ( renderer && !renderer->willRenderFeature( feature, renderCtx ) )
if ( filter && renderer && !renderer->willRenderFeature( feature, renderCtx ) )
{
continue;
}
Expand Down

0 comments on commit a25a561

Please sign in to comment.