Fix layer expression scope sometimes not appended to render

context expression scopes
qgis · Jan 23, 2017 · 2c24175 · 2c24175
1 parent 17d4d3a
commit 2c24175
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/core/qgslabelingengine.cpp b/src/core/qgslabelingengine.cpp
@@ -213,7 +213,15 @@ void QgsLabelingEngine::run( QgsRenderContext& context )
   // for each provider: get labels and register them in PAL
   Q_FOREACH ( QgsAbstractLabelProvider* provider, mProviders )
   {
+    bool appendedLayerScope = false;
+    if ( QgsMapLayer* ml = QgsProject::instance()->mapLayer( provider->layerId() ) )
+    {
+      appendedLayerScope = true;
+      context.expressionContext().appendScope( QgsExpressionContextUtils::layerScope( ml ) );
+    }
     processProvider( provider, context, p );  //#spellok
+    if ( appendedLayerScope )
+      delete context.expressionContext().popScope();
   }
 
 

diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -245,6 +245,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsLabelingEn
     job.renderingTime = -1;
 
     job.context = QgsRenderContext::fromMapSettings( mSettings );
+    job.context.expressionContext().appendScope( QgsExpressionContextUtils::layerScope( ml ) );
     job.context.setPainter( painter );
     job.context.setLabelingEngine( labelingEngine2 );
     job.context.setCoordinateTransform( ct );

diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -98,6 +98,7 @@ class TestQgsDiagram : public QObject
       mPointsLayer->setRenderer( symbolRenderer );
 
       // Create map composition to draw on
+      QgsProject::instance()->addMapLayer( mPointsLayer );
       mMapSettings->setLayers( QList<QgsMapLayer*>() << mPointsLayer );
 
       mReport += QLatin1String( "<h1>Diagram Tests</h1>\n" );