Skip to content

Commit 51408e1

Browse files
committed
categorized renderer: show category by default (followup 4867b7f)
1 parent b4edd9d commit 51408e1

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class QgsRendererCategoryV2
66
public:
77

88
//! takes ownership of symbol
9-
QgsRendererCategoryV2( QVariant value, QgsSymbolV2* symbol /Transfer/, QString label, bool render );
9+
QgsRendererCategoryV2( QVariant value, QgsSymbolV2* symbol /Transfer/, QString label, bool render = true );
1010

1111
//! copy constructor
1212
QgsRendererCategoryV2( const QgsRendererCategoryV2& cat );

src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,10 @@ bool QgsCategorizedSymbolRendererV2::legendSymbolItemsCheckable() const
752752

753753
bool QgsCategorizedSymbolRendererV2::legendSymbolItemChecked( int index )
754754
{
755-
return index < 0 ? true : mCategories[ index ].renderState();
755+
if( index >= 0 && index < mCategories.size() )
756+
return mCategories[ index ].renderState();
757+
else
758+
return true;
756759
}
757760

758761
void QgsCategorizedSymbolRendererV2::checkLegendSymbolItem( int index, bool state )

src/core/symbology-ng/qgscategorizedsymbolrendererv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CORE_EXPORT QgsRendererCategoryV2
3232
QgsRendererCategoryV2( );
3333

3434
//! takes ownership of symbol
35-
QgsRendererCategoryV2( QVariant value, QgsSymbolV2* symbol, QString label, bool render );
35+
QgsRendererCategoryV2( QVariant value, QgsSymbolV2* symbol, QString label, bool render = true );
3636

3737
//! copy constructor
3838
QgsRendererCategoryV2( const QgsRendererCategoryV2& cat );

src/core/symbology-ng/qgsrendererv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class CORE_EXPORT QgsFeatureRendererV2
156156

157157
//! items of symbology items in legend is checked
158158
//! @note added in 2.5
159-
virtual bool legendSymbolItemChecked( int key );
159+
virtual bool legendSymbolItemChecked( int index );
160160

161161
//! item in symbology was checked
162162
//! @note added in 2.5

0 commit comments

Comments
 (0)