sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix method signature for non rule based symbol

Browse Source
This commit is contained in:
Stéphane Brunner 2013-09-15 14:23:44 +02:00
parent 10f699ea86
commit 57b695b10f
9 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
View File

@ -635,7 +635,7 @@ QgsLegendSymbologyList QgsCategorizedSymbolRendererV2::legendSymbologyItems( QSi
return lst;
}
QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double scaleDenominator )
QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double scaleDenominator, QString rule )
{
Q_UNUSED( scaleDenominator );
QSettings settings;

2
src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
View File

@ -125,7 +125,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2
//! return a list of item text / symbol
//! @note: this method was added in version 1.5
//! @note not available in python bindings
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1 );
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = "" );
QgsSymbolV2* sourceSymbol();
void setSourceSymbol( QgsSymbolV2* sym );

2
src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
View File

@ -1095,7 +1095,7 @@ QgsLegendSymbologyList QgsGraduatedSymbolRendererV2::legendSymbologyItems( QSize
return lst;
}
QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scaleDenominator )
QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scaleDenominator, QString rule )
{
Q_UNUSED( scaleDenominator );
QSettings settings;

2
src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
View File

@ -137,7 +137,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
//! return a list of item text / symbol
//! @note: this method was added in version 1.5
//! @note not available in python bindings
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1 );
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = "" );
QgsSymbolV2* sourceSymbol();
void setSourceSymbol( QgsSymbolV2* sym );

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

@ -330,11 +330,11 @@ QgsLegendSymbologyList QgsPointDisplacementRenderer::legendSymbologyItems( QSize
return QgsLegendSymbologyList();
}
QgsLegendSymbolList QgsPointDisplacementRenderer::legendSymbolItems()
QgsLegendSymbolList QgsPointDisplacementRenderer::legendSymbolItems( double scaleDenominator, QString rule )
{
if ( mRenderer )
{
return mRenderer->legendSymbolItems();
return mRenderer->legendSymbolItems( scaleDenominator, rule );
}
return QgsLegendSymbolList();
}

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

@ -57,7 +57,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2
QgsLegendSymbologyList legendSymbologyItems( QSize iconSize );
//! @note not available in python bindings
QgsLegendSymbolList legendSymbolItems();
QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = "" );
void setLabelAttributeName( const QString& name ) { mLabelAttributeName = name; }
QString labelAttributeName() const { return mLabelAttributeName; }

1
src/core/symbology-ng/qgsrendererv2.cpp
View File

@ -510,6 +510,7 @@ QgsLegendSymbologyList QgsFeatureRendererV2::legendSymbologyItems( QSize iconSiz
QgsLegendSymbolList QgsFeatureRendererV2::legendSymbolItems( double scaleDenominator, QString rule )
{
Q_UNUSED( scaleDenominator );
Q_UNUSED( rule );
return QgsLegendSymbolList();
}

3
src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
View File

@ -373,9 +373,10 @@ QgsLegendSymbologyList QgsSingleSymbolRendererV2::legendSymbologyItems( QSize ic
return lst;
}
QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems( double scaleDenominator )
QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems( double scaleDenominator, QString rule )
{
Q_UNUSED( scaleDenominator );
Q_UNUSED( rule );
QgsLegendSymbolList lst;
lst << qMakePair( QString(), mSymbol );
return lst;

2
src/core/symbology-ng/qgssinglesymbolrendererv2.h
View File

@ -78,7 +78,7 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2
//! return a list of item text / symbol
//! @note: this method was added in version 1.5
//! @note not available in python bindings
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1 );
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = "" );
protected:
QgsSymbolV2* mSymbol;