Fix layer expression scope sometimes not appended to render

nyalldawson · nyalldawson · commit 2c241755f8b2 · 2017-01-23T12:45:22.000+10:00
context expression scopes
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" );

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,15 @@ void QgsLabelingEngine::run( QgsRenderContext& context )`
`213`	`213`	`// for each provider: get labels and register them in PAL`
`214`	`214`	`Q_FOREACH ( QgsAbstractLabelProvider* provider, mProviders )`
`215`	`215`	`{`
	`216`	`+ bool appendedLayerScope = false;`
	`217`	`+ if ( QgsMapLayer* ml = QgsProject::instance()->mapLayer( provider->layerId() ) )`
	`218`	`+ {`
	`219`	`+ appendedLayerScope = true;`
	`220`	`+ context.expressionContext().appendScope( QgsExpressionContextUtils::layerScope( ml ) );`
	`221`	`+ }`
`216`	`222`	`processProvider( provider, context, p ); //#spellok`
	`223`	`+ if ( appendedLayerScope )`
	`224`	`+ delete context.expressionContext().popScope();`
`217`	`225`	`}`
`218`	`226`
`219`	`227`