[locator] Add active layer scope to the calculator locator filter

nirvn · nirvn · commit dc6cc08e541e · 2019-04-05T05:01:42.000Z
This allows the usage of layer scope functions such as
sum("MY_FIELD")
diff --git a/src/app/locator/qgsinbuiltlocatorfilters.cpp b/src/app/locator/qgsinbuiltlocatorfilters.cpp
@@ -448,7 +448,8 @@ void QgsExpressionCalculatorLocatorFilter::fetchResults( const QString &string,
 {
   QgsExpressionContext context;
   context << QgsExpressionContextUtils::globalScope()
-          << QgsExpressionContextUtils::projectScope( QgsProject::instance() );
+          << QgsExpressionContextUtils::projectScope( QgsProject::instance() )
+          << QgsExpressionContextUtils::layerScope( QgisApp::instance()->activeLayer() );
 
   QString error;
   if ( QgsExpression::checkExpression( string, &context, error ) )

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,8 @@ void QgsExpressionCalculatorLocatorFilter::fetchResults( const QString &string,`
`448`	`448`	`{`
`449`	`449`	`QgsExpressionContext context;`
`450`	`450`	`context << QgsExpressionContextUtils::globalScope()`
`451`		`- << QgsExpressionContextUtils::projectScope( QgsProject::instance() );`
	`451`	`+ << QgsExpressionContextUtils::projectScope( QgsProject::instance() )`
	`452`	`+ << QgsExpressionContextUtils::layerScope( QgisApp::instance()->activeLayer() );`
`452`	`453`
`453`	`454`	`QString error;`
`454`	`455`	`if ( QgsExpression::checkExpression( string, &context, error ) )`