Make sure all attributes are fetched for distance based renderers

qgis · Sep 29, 2016 · 7acb07f · 7acb07f
1 parent 3253cdc
commit 7acb07f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 0 deletions.
diff --git a/python/core/symbology-ng/qgspointclusterrenderer.sip b/python/core/symbology-ng/qgspointclusterrenderer.sip
@@ -16,6 +16,7 @@ class QgsPointClusterRenderer : QgsPointDistanceRenderer
     virtual void startRender( QgsRenderContext& context, const QgsFields& fields );
     void stopRender( QgsRenderContext& context );
     QDomElement save( QDomDocument& doc );
+    virtual QList<QString> usedAttributes();
 
     //! Create a renderer from XML element
     static QgsFeatureRenderer* create( QDomElement& symbologyElem ) /Factory/;

diff --git a/python/core/symbology-ng/qgspointdisplacementrenderer.sip b/python/core/symbology-ng/qgspointdisplacementrenderer.sip
@@ -26,6 +26,7 @@ class QgsPointDisplacementRenderer : QgsPointDistanceRenderer
     virtual void startRender( QgsRenderContext& context, const QgsFields& fields );
     void stopRender( QgsRenderContext& context );
     QDomElement save( QDomDocument& doc );
+    virtual QList<QString> usedAttributes();
 
     //! Create a renderer from XML element
     static QgsFeatureRenderer* create( QDomElement& symbologyElem ) /Factory/;

diff --git a/src/core/symbology-ng/qgspointclusterrenderer.cpp b/src/core/symbology-ng/qgspointclusterrenderer.cpp
@@ -179,6 +179,14 @@ QDomElement QgsPointClusterRenderer::save( QDomDocument& doc )
   return rendererElement;
 }
 
+QList<QString> QgsPointClusterRenderer::usedAttributes()
+{
+  QList<QString> attr = QgsPointDistanceRenderer::usedAttributes();
+  if ( mClusterSymbol )
+    attr.append( mClusterSymbol->usedAttributes().toList() );
+  return attr;
+}
+
 void QgsPointClusterRenderer::setClusterSymbol( QgsMarkerSymbol* symbol )
 {
   mClusterSymbol.reset( symbol );

diff --git a/src/core/symbology-ng/qgspointclusterrenderer.h b/src/core/symbology-ng/qgspointclusterrenderer.h
@@ -35,6 +35,7 @@ class CORE_EXPORT QgsPointClusterRenderer: public QgsPointDistanceRenderer
     virtual void startRender( QgsRenderContext& context, const QgsFields& fields ) override;
     void stopRender( QgsRenderContext& context ) override;
     QDomElement save( QDomDocument& doc ) override;
+    virtual QList<QString> usedAttributes() override;
 
     //! Creates a renderer from XML element
     static QgsFeatureRenderer* create( QDomElement& symbologyElem );

diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
@@ -211,6 +211,14 @@ QDomElement QgsPointDisplacementRenderer::save( QDomDocument& doc )
   return rendererElement;
 }
 
+QList<QString> QgsPointDisplacementRenderer::usedAttributes()
+{
+  QList<QString> attr = QgsPointDistanceRenderer::usedAttributes();
+  if ( mCenterSymbol )
+    attr.append( mCenterSymbol->usedAttributes().toList() );
+  return attr;
+}
+
 void QgsPointDisplacementRenderer::setCenterSymbol( QgsMarkerSymbol* symbol )
 {
   mCenterSymbol.reset( symbol );

diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.h b/src/core/symbology-ng/qgspointdisplacementrenderer.h
@@ -45,6 +45,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsPointDistanceRenderer
     virtual void startRender( QgsRenderContext& context, const QgsFields& fields ) override;
     void stopRender( QgsRenderContext& context ) override;
     QDomElement save( QDomDocument& doc ) override;
+    virtual QList<QString> usedAttributes() override;
 
     //! Create a renderer from XML element
     static QgsFeatureRenderer* create( QDomElement& symbologyElem );