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

nirvn · nirvn · commit af4e9111f4be · 2019-04-05T16:37:34.000+07:00
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
@@ -478,7 +478,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
`@@ -478,7 +478,8 @@ void QgsExpressionCalculatorLocatorFilter::fetchResults( const QString &string,`
`478`	`478`	`{`
`479`	`479`	`QgsExpressionContext context;`
`480`	`480`	`context << QgsExpressionContextUtils::globalScope()`
`481`		`- << QgsExpressionContextUtils::projectScope( QgsProject::instance() );`
	`481`	`+ << QgsExpressionContextUtils::projectScope( QgsProject::instance() )`
	`482`	`+ << QgsExpressionContextUtils::layerScope( QgisApp::instance()->activeLayer() );`
`482`	`483`
`483`	`484`	`QString error;`
`484`	`485`	`if ( QgsExpression::checkExpression( string, &context, error ) )`