Fix #10535 (legend symbol items for graduated symbol renderer)

wonder-sk · wonder-sk · commit 1acf45f5cd59 · 2014-06-11T01:13:19.000+07:00
The implementation used temporary symbols which are only valid
between startRender()/stopRender() calls and was breaking
also composer legend.
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -1116,16 +1116,7 @@ QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scal
   {
     if ( rule.isEmpty() || range.label() == rule )
     {
-      QgsSymbolV2* symbol;
-      if ( !mRotation.data() && !mSizeScale.data() )
-      {
-        symbol = range.symbol();
-      }
-      else
-      {
-        symbol = mTempSymbols[range.symbol()];
-      }
-      lst << qMakePair( range.label(), symbol );
+      lst << qMakePair( range.label(), range.symbol() );
     }
   }
   return lst;

Original file line number	Diff line number	Diff line change
`@@ -1116,16 +1116,7 @@ QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scal`
`1116`	`1116`	`{`
`1117`	`1117`	`if ( rule.isEmpty() \|\| range.label() == rule )`
`1118`	`1118`	`{`
`1119`		`- QgsSymbolV2* symbol;`
`1120`		`- if ( !mRotation.data() && !mSizeScale.data() )`
`1121`		`- {`
`1122`		`- symbol = range.symbol();`
`1123`		`- }`
`1124`		`- else`
`1125`		`- {`
`1126`		`- symbol = mTempSymbols[range.symbol()];`
`1127`		`- }`
`1128`		`- lst << qMakePair( range.label(), symbol );`
	`1119`	`+ lst << qMakePair( range.label(), range.symbol() );`
`1129`	`1120`	`}`
`1130`	`1121`	`}`
`1131`	`1122`	`return lst;`