Skip to content

Commit c71d877

Browse files
committed
Fix renderer items in legend (#8651)
1 parent b9bbe65 commit c71d877

6 files changed

+9
-6
lines changed

src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,8 +635,9 @@ QgsLegendSymbologyList QgsCategorizedSymbolRendererV2::legendSymbologyItems( QSi
635635
return lst;
636636
}
637637

638-
QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems()
638+
QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double scaleDenominator )
639639
{
640+
Q_UNUSED( scaleDenominator );
640641
QSettings settings;
641642
bool showClassifiers = settings.value( "/qgis/showLegendClassifiers", false ).toBool();
642643

src/core/symbology-ng/qgscategorizedsymbolrendererv2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2
125125
//! return a list of item text / symbol
126126
//! @note: this method was added in version 1.5
127127
//! @note not available in python bindings
128-
virtual QgsLegendSymbolList legendSymbolItems();
128+
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1 );
129129

130130
QgsSymbolV2* sourceSymbol();
131131
void setSourceSymbol( QgsSymbolV2* sym );

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,8 +1095,9 @@ QgsLegendSymbologyList QgsGraduatedSymbolRendererV2::legendSymbologyItems( QSize
10951095
return lst;
10961096
}
10971097

1098-
QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems()
1098+
QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scaleDenominator )
10991099
{
1100+
Q_UNUSED( scaleDenominator );
11001101
QSettings settings;
11011102
bool showClassifiers = settings.value( "/qgis/showLegendClassifiers", false ).toBool();
11021103

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
137137
//! return a list of item text / symbol
138138
//! @note: this method was added in version 1.5
139139
//! @note not available in python bindings
140-
virtual QgsLegendSymbolList legendSymbolItems();
140+
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1 );
141141

142142
QgsSymbolV2* sourceSymbol();
143143
void setSourceSymbol( QgsSymbolV2* sym );

src/core/symbology-ng/qgssinglesymbolrendererv2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,9 @@ QgsLegendSymbologyList QgsSingleSymbolRendererV2::legendSymbologyItems( QSize ic
373373
return lst;
374374
}
375375

376-
QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems()
376+
QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems( double scaleDenominator )
377377
{
378+
Q_UNUSED( scaleDenominator );
378379
QgsLegendSymbolList lst;
379380
lst << qMakePair( QString(), mSymbol );
380381
return lst;

src/core/symbology-ng/qgssinglesymbolrendererv2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2
7878
//! return a list of item text / symbol
7979
//! @note: this method was added in version 1.5
8080
//! @note not available in python bindings
81-
virtual QgsLegendSymbolList legendSymbolItems();
81+
virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1 );
8282

8383
protected:
8484
QgsSymbolV2* mSymbol;

0 commit comments

Comments
 (0)