sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure all attributes are fetched for distance based renderers

Browse Source
This commit is contained in:
Nyall Dawson 2016-09-12 11:17:17 +10:00
parent 3253cdc2fb
commit 7acb07f218
6 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/core/symbology-ng/qgspointclusterrenderer.sip
View File

@ -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/;

1
python/core/symbology-ng/qgspointdisplacementrenderer.sip
View File

@ -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/;

8
src/core/symbology-ng/qgspointclusterrenderer.cpp
View File

@ -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 );

1
src/core/symbology-ng/qgspointclusterrenderer.h
View File

@ -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 );

8
src/core/symbology-ng/qgspointdisplacementrenderer.cpp
View File

@ -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 );

1
src/core/symbology-ng/qgspointdisplacementrenderer.h
View File

@ -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 );