Proxy filterNeedsGeometry for inverted/displacement renderers

qgis · Sep 24, 2018 · 81487f9 · 81487f9
1 parent b5867bf
commit 81487f9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 0 deletions.
diff --git a/python/core/auto_generated/symbology/qgsinvertedpolygonrenderer.sip.in b/python/core/auto_generated/symbology/qgsinvertedpolygonrenderer.sip.in
@@ -76,6 +76,8 @@ Features collected during renderFeature() are rendered using the embedded featur
 %Docstring
 Proxy that will call this method on the embedded renderer.
 %End
+    virtual bool filterNeedsGeometry() const;
+
     virtual QgsFeatureRenderer::Capabilities capabilities();
 
 %Docstring

diff --git a/python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in b/python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in
@@ -69,6 +69,8 @@ Constructor for QgsPointDistanceRenderer.
 
     virtual QSet<QString> usedAttributes( const QgsRenderContext &context ) const;
 
+    virtual bool filterNeedsGeometry() const;
+
     virtual QgsFeatureRenderer::Capabilities capabilities();
 
     virtual QgsSymbolList symbols( QgsRenderContext &context ) const;

diff --git a/src/core/symbology/qgsinvertedpolygonrenderer.cpp b/src/core/symbology/qgsinvertedpolygonrenderer.cpp
@@ -476,6 +476,11 @@ QSet<QString> QgsInvertedPolygonRenderer::usedAttributes( const QgsRenderContext
   return mSubRenderer->usedAttributes( context );
 }
 
+bool QgsInvertedPolygonRenderer::filterNeedsGeometry() const
+{
+  return mSubRenderer ? mSubRenderer->filterNeedsGeometry() : false;
+}
+
 QgsLegendSymbolList QgsInvertedPolygonRenderer::legendSymbolItems() const
 {
   if ( !mSubRenderer )

diff --git a/src/core/symbology/qgsinvertedpolygonrenderer.h b/src/core/symbology/qgsinvertedpolygonrenderer.h
@@ -79,6 +79,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer
 
     //! Proxy that will call this method on the embedded renderer.
     QSet<QString> usedAttributes( const QgsRenderContext &context ) const override;
+    bool filterNeedsGeometry() const override;
     //! Proxy that will call this method on the embedded renderer.
     QgsFeatureRenderer::Capabilities capabilities() override;
 

diff --git a/src/core/symbology/qgspointdistancerenderer.cpp b/src/core/symbology/qgspointdistancerenderer.cpp
@@ -218,6 +218,11 @@ QSet<QString> QgsPointDistanceRenderer::usedAttributes( const QgsRenderContext &
   return attributeList;
 }
 
+bool QgsPointDistanceRenderer::filterNeedsGeometry() const
+{
+  return mRenderer ? mRenderer->filterNeedsGeometry() : false;
+}
+
 QgsFeatureRenderer::Capabilities QgsPointDistanceRenderer::capabilities()
 {
   if ( !mRenderer )

diff --git a/src/core/symbology/qgspointdistancerenderer.h b/src/core/symbology/qgspointdistancerenderer.h
@@ -86,6 +86,7 @@ class CORE_EXPORT QgsPointDistanceRenderer: public QgsFeatureRenderer
     void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const override;
     bool renderFeature( const QgsFeature &feature, QgsRenderContext &context, int layer = -1, bool selected = false, bool drawVertexMarker = false ) override;
     QSet<QString> usedAttributes( const QgsRenderContext &context ) const override;
+    bool filterNeedsGeometry() const override;
     QgsFeatureRenderer::Capabilities capabilities() override;
     QgsSymbolList symbols( QgsRenderContext &context ) const override;
     QgsSymbol *symbolForFeature( const QgsFeature &feature, QgsRenderContext &context ) const override;