From b7ef48aee333ad046e1068337a70e322b22fdcf6 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 15 May 2013 20:28:17 +0200 Subject: [PATCH] [Fix #7405] Graduated renderer: Feature count 0 with scale or rotation --- .../qgscategorizedsymbolrendererv2.cpp | 5 ++--- .../symbology-ng/qgsgraduatedsymbolrendererv2.cpp | 14 +++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp index 054390b38d62..1eabe80a62e1 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp @@ -635,10 +635,9 @@ QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems() lst << qMakePair( classAttribute(), ( QgsSymbolV2* )0 ); } - QgsCategoryList::const_iterator catIt = mCategories.constBegin(); - for ( ; catIt != mCategories.constEnd(); ++catIt ) + foreach ( const QgsRendererCategoryV2& cat, mCategories ) { - lst << qMakePair( catIt->label(), catIt->symbol() ); + lst << qMakePair( cat.label(), cat.symbol() ); } return lst; } diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp index 805bf62ea33b..962e103bb1c5 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp @@ -1076,10 +1076,18 @@ QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems() lst << qMakePair( classAttribute(), ( QgsSymbolV2* )0 ); } - QgsRangeList::const_iterator rangeIt = mRanges.constBegin(); - for ( ; rangeIt != mRanges.constEnd(); ++rangeIt ) + foreach ( const QgsRendererRangeV2& range, mRanges ) { - lst << qMakePair( rangeIt->label(), rangeIt->symbol() ); + QgsSymbolV2* symbol; + if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 ) + { + symbol = range.symbol(); + } + else + { + symbol = mTempSymbols[range.symbol()]; + } + lst << qMakePair( range.label(), symbol ); } return lst; }