Fix calculation of random colors following 4d72d72

nyalldawson · nyalldawson · commit 08d80160ea0e · 2014-10-13T22:50:53.000+11:00
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -369,7 +369,8 @@ QColor QgsRandomColorsV2::color( double value ) const
   int minVal = 130;
   int maxVal = 255;
 
-  int colorIndex = !isnan( value ) ? value : 1 * ( mTotalColorCount - 1 );
+  //if value is nan, then use last precalculated color
+  int colorIndex = ( !isnan( value ) ? value : 1 ) * ( mTotalColorCount - 1 );
   if ( mTotalColorCount >= 1 && mPrecalculatedColors.length() > colorIndex )
   {
     //use precalculated hue

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,8 @@ QColor QgsRandomColorsV2::color( double value ) const`
`369`	`369`	`int minVal = 130;`
`370`	`370`	`int maxVal = 255;`
`371`	`371`
`372`		`- int colorIndex = !isnan( value ) ? value : 1 * ( mTotalColorCount - 1 );`
	`372`	`+ //if value is nan, then use last precalculated color`
	`373`	`+ int colorIndex = ( !isnan( value ) ? value : 1 ) * ( mTotalColorCount - 1 );`
`373`	`374`	`if ( mTotalColorCount >= 1 && mPrecalculatedColors.length() > colorIndex )`
`374`	`375`	`{`
`375`	`376`	`//use precalculated hue`