fixes bug when specifying number of classes greater than number of features. Fixes #3325

cfarmer · cfarmer · commit c4413b62319d · 2010-12-13T15:01:54.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14900 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -558,6 +558,11 @@ static QList<double> _calcJenksBreaks( QList<double> values, int classes,
   }
 
   int n = values.count();
+  if ( classes >= n )
+  {
+    return values;
+  }
+
   QList<double> sample;
 
   // if we have lots of values, we need to take a random sample
@@ -769,8 +774,6 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(
   return r;
 }
 
-
-
 QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element )
 {
   QDomElement symbolsElem = element.firstChildElement( "symbols" );

Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,11 @@ static QList<double> _calcJenksBreaks( QList<double> values, int classes,`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`int n = values.count();`
	`561`	`+ if ( classes >= n )`
	`562`	`+ {`
	`563`	`+ return values;`
	`564`	`+ }`
	`565`	`+`
`561`	`566`	`QList<double> sample;`
`562`	`567`
`563`	`568`	`// if we have lots of values, we need to take a random sample`
`@@ -769,8 +774,6 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(`
`769`	`774`	`return r;`
`770`	`775`	`}`
`771`	`776`
`772`		`-`
`773`		`-`
`774`	`777`	`QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element )`
`775`	`778`	`{`
`776`	`779`	`QDomElement symbolsElem = element.firstChildElement( "symbols" );`