Allow specifying expression context for feature count

qgis · May 11, 2017 · 2474498 · 2474498
1 parent 1fb55db
commit 2474498
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/python/core/qgsvectorlayerfeaturecounter.sip b/python/core/qgsvectorlayerfeaturecounter.sip
@@ -24,7 +24,7 @@ class QgsVectorLayerFeatureCounter : QgsTask
 %End
   public:
 
-    QgsVectorLayerFeatureCounter( QgsVectorLayer *layer );
+    QgsVectorLayerFeatureCounter( QgsVectorLayer *layer, const QgsExpressionContext &context = QgsExpressionContext() );
 %Docstring
  Create a new feature counter for ``layer``.
 %End

diff --git a/src/core/qgsvectorlayerfeaturecounter.cpp b/src/core/qgsvectorlayerfeaturecounter.cpp
@@ -1,11 +1,15 @@
 #include "qgsvectorlayerfeaturecounter.h"
 
-QgsVectorLayerFeatureCounter::QgsVectorLayerFeatureCounter( QgsVectorLayer *layer )
+QgsVectorLayerFeatureCounter::QgsVectorLayerFeatureCounter( QgsVectorLayer *layer, const QgsExpressionContext &context )
   : mSource( new QgsVectorLayerFeatureSource( layer ) )
   , mRenderer( layer->renderer()->clone() )
-  , mExpressionContextScopes( QgsExpressionContextUtils::globalProjectLayerScopes( layer ) )
+  , mExpressionContext( context )
   , mFeatureCount( layer->featureCount() )
 {
+  if ( !mExpressionContext.scopeCount() )
+  {
+    mExpressionContext = layer->createExpressionContext();
+  }
 }
 
 bool QgsVectorLayerFeatureCounter::run()
@@ -26,7 +30,7 @@ bool QgsVectorLayerFeatureCounter::run()
     // Renderer (rule based) may depend on context scale, with scale is ignored if 0
     QgsRenderContext renderContext;
     renderContext.setRendererScale( 0 );
-    renderContext.expressionContext().appendScopes( mExpressionContextScopes );
+    renderContext.setExpressionContext( mExpressionContext );
 
     QgsFeatureRequest request;
     if ( !mRenderer->filterNeedsGeometry() )

diff --git a/src/core/qgsvectorlayerfeaturecounter.h b/src/core/qgsvectorlayerfeaturecounter.h
@@ -24,7 +24,7 @@ class CORE_EXPORT QgsVectorLayerFeatureCounter : public QgsTask
     /**
      * Create a new feature counter for \a layer.
      */
-    QgsVectorLayerFeatureCounter( QgsVectorLayer *layer );
+    QgsVectorLayerFeatureCounter( QgsVectorLayer *layer, const QgsExpressionContext &context = QgsExpressionContext() );
 
     virtual bool run() override;
 
@@ -52,7 +52,7 @@ class CORE_EXPORT QgsVectorLayerFeatureCounter : public QgsTask
   private:
     std::unique_ptr<QgsVectorLayerFeatureSource> mSource;
     std::unique_ptr<QgsFeatureRenderer> mRenderer;
-    QList<QgsExpressionContextScope *> mExpressionContextScopes;
+    QgsExpressionContext mExpressionContext;
     QHash<QString, long> mSymbolFeatureCountMap;
     int mFeatureCount;