Skip to content

Commit

Permalink
Add missing proxies for legend check behaviour to subrenderers
Browse files Browse the repository at this point in the history
for inverted polygon and displacement renderers

(cherry-picked from 7a8d9dd)
  • Loading branch information
nyalldawson committed Jun 30, 2016
1 parent 0750c1d commit cb9c026
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 0 deletions.
4 changes: 4 additions & 0 deletions python/core/symbology-ng/qgspointdisplacementrenderer.sip
Expand Up @@ -73,6 +73,10 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2


virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol ); virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol );


virtual bool legendSymbolItemsCheckable() const;
virtual bool legendSymbolItemChecked( const QString& key );
virtual void checkLegendSymbolItem( const QString& key, bool state = true );

//! not available in python bindings //! not available in python bindings
//! @deprecated since 2.4 //! @deprecated since 2.4
// void setDisplacementGroups( const QList<QMap<QgsFeatureId, QgsFeature> >& list ); // void setDisplacementGroups( const QList<QMap<QgsFeatureId, QgsFeature> >& list );
Expand Down
24 changes: 24 additions & 0 deletions src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
Expand Up @@ -72,6 +72,30 @@ void QgsInvertedPolygonRenderer::setLegendSymbolItem( const QString& key, QgsSym
mSubRenderer->setLegendSymbolItem( key, symbol ); mSubRenderer->setLegendSymbolItem( key, symbol );
} }


bool QgsInvertedPolygonRenderer::legendSymbolItemsCheckable() const
{
if ( !mSubRenderer )
return false;

return mSubRenderer->legendSymbolItemsCheckable();
}

bool QgsInvertedPolygonRenderer::legendSymbolItemChecked( const QString& key )
{
if ( !mSubRenderer )
return false;

return mSubRenderer->legendSymbolItemChecked( key );
}

void QgsInvertedPolygonRenderer::checkLegendSymbolItem( const QString& key, bool state )
{
if ( !mSubRenderer )
return;

return mSubRenderer->checkLegendSymbolItem( key, state );
}

void QgsInvertedPolygonRenderer::startRender( QgsRenderContext& context, const QgsFields& fields ) void QgsInvertedPolygonRenderer::startRender( QgsRenderContext& context, const QgsFields& fields )
{ {
if ( !mSubRenderer ) if ( !mSubRenderer )
Expand Down
4 changes: 4 additions & 0 deletions src/core/symbology-ng/qgsinvertedpolygonrenderer.h
Expand Up @@ -123,6 +123,10 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2


virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol ) override; virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol ) override;


virtual bool legendSymbolItemsCheckable() const override;
virtual bool legendSymbolItemChecked( const QString& key ) override;
virtual void checkLegendSymbolItem( const QString& key, bool state = true ) override;

/** @returns true if the geometries are to be preprocessed (merged with an union) before rendering.*/ /** @returns true if the geometries are to be preprocessed (merged with an union) before rendering.*/
bool preprocessingEnabled() const { return mPreprocessingEnabled; } bool preprocessingEnabled() const { return mPreprocessingEnabled; }
/** /**
Expand Down
24 changes: 24 additions & 0 deletions src/core/symbology-ng/qgspointdisplacementrenderer.cpp
Expand Up @@ -234,6 +234,30 @@ void QgsPointDisplacementRenderer::setLegendSymbolItem( const QString& key, QgsS
mRenderer->setLegendSymbolItem( key, symbol ); mRenderer->setLegendSymbolItem( key, symbol );
} }


bool QgsPointDisplacementRenderer::legendSymbolItemsCheckable() const
{
if ( !mRenderer )
return false;

return mRenderer->legendSymbolItemsCheckable();
}

bool QgsPointDisplacementRenderer::legendSymbolItemChecked( const QString& key )
{
if ( !mRenderer )
return false;

return mRenderer->legendSymbolItemChecked( key );
}

void QgsPointDisplacementRenderer::checkLegendSymbolItem( const QString& key, bool state )
{
if ( !mRenderer )
return;

return mRenderer->checkLegendSymbolItem( key, state );
}

QList<QString> QgsPointDisplacementRenderer::usedAttributes() QList<QString> QgsPointDisplacementRenderer::usedAttributes()
{ {
QList<QString> attributeList; QList<QString> attributeList;
Expand Down
4 changes: 4 additions & 0 deletions src/core/symbology-ng/qgspointdisplacementrenderer.h
Expand Up @@ -100,6 +100,10 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2


virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol ) override; virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol ) override;


virtual bool legendSymbolItemsCheckable() const override;
virtual bool legendSymbolItemChecked( const QString& key ) override;
virtual void checkLegendSymbolItem( const QString& key, bool state = true ) override;

//! not available in python bindings //! not available in python bindings
//! @deprecated since 2.4 //! @deprecated since 2.4
Q_DECL_DEPRECATED void setDisplacementGroups( const QList<QMap<QgsFeatureId, QgsFeature> >& list ) { Q_UNUSED( list ); } Q_DECL_DEPRECATED void setDisplacementGroups( const QList<QMap<QgsFeatureId, QgsFeature> >& list ) { Q_UNUSED( list ); }
Expand Down

0 comments on commit cb9c026

Please sign in to comment.