Get the right rule in Categorized and Graduated

Stéphane Brunner · Stéphane Brunner · commit b1c26bf4a43f · 2013-10-19T12:48:01.000+02:00
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -649,7 +649,10 @@ QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double sc
 
   foreach ( const QgsRendererCategoryV2& cat, mCategories )
   {
-    lst << qMakePair( cat.label(), cat.symbol() );
+    if ( rule.isEmpty() || cat.label() == rule )
+    {
+      lst << qMakePair( cat.label(), cat.symbol() );
+    }
   }
   return lst;
 }
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -1109,16 +1109,19 @@ QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scal
 
   foreach ( const QgsRendererRangeV2& range, mRanges )
   {
-    QgsSymbolV2* symbol;
-    if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
+    if ( rule.isEmpty() || range.label() == rule )
     {
-      symbol = range.symbol();
-    }
-    else
-    {
-      symbol = mTempSymbols[range.symbol()];
+      QgsSymbolV2* symbol;
+      if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
+      {
+        symbol = range.symbol();
+      }
+      else
+      {
+        symbol = mTempSymbols[range.symbol()];
+      }
+      lst << qMakePair( range.label(), symbol );
     }
-    lst << qMakePair( range.label(), symbol );
   }
   return lst;
 }

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,10 @@ QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double sc`
`649`	`649`
`650`	`650`	`foreach ( const QgsRendererCategoryV2& cat, mCategories )`
`651`	`651`	`{`
`652`		`- lst << qMakePair( cat.label(), cat.symbol() );`
	`652`	`+ if ( rule.isEmpty() \|\| cat.label() == rule )`
	`653`	`+ {`
	`654`	`+ lst << qMakePair( cat.label(), cat.symbol() );`
	`655`	`+ }`
`653`	`656`	`}`
`654`	`657`	`return lst;`
`655`	`658`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1109,16 +1109,19 @@ QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scal`
`1109`	`1109`
`1110`	`1110`	`foreach ( const QgsRendererRangeV2& range, mRanges )`
`1111`	`1111`	`{`
`1112`		`- QgsSymbolV2* symbol;`
`1113`		`- if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )`
	`1112`	`+ if ( rule.isEmpty() \|\| range.label() == rule )`
`1114`	`1113`	`{`
`1115`		`- symbol = range.symbol();`
`1116`		`- }`
`1117`		`- else`
`1118`		`- {`
`1119`		`- symbol = mTempSymbols[range.symbol()];`
	`1114`	`+ QgsSymbolV2* symbol;`
	`1115`	`+ if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )`
	`1116`	`+ {`
	`1117`	`+ symbol = range.symbol();`
	`1118`	`+ }`
	`1119`	`+ else`
	`1120`	`+ {`
	`1121`	`+ symbol = mTempSymbols[range.symbol()];`
	`1122`	`+ }`
	`1123`	`+ lst << qMakePair( range.label(), symbol );`
`1120`	`1124`	`}`
`1121`		`- lst << qMakePair( range.label(), symbol );`
`1122`	`1125`	`}`
`1123`	`1126`	`return lst;`
`1124`	`1127`	`}`