Fix saturation range ignored for random color ramps

nyalldawson · nyalldawson · commit fd394b9d6304 · 2015-08-04T21:22:09.000+10:00
(cherry-picked from 5690402)
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -346,7 +346,7 @@ QList<QColor> QgsVectorRandomColorRampV2::randomColors( int count,
     currentHueAngle += 137.50776;
     //scale hue to between hueMax and hueMin
     h = qBound( 0, qRound(( fmod( currentHueAngle, 360.0 ) / 360.0 ) * ( safeHueMax - safeHueMin ) + safeHueMin ), 359 );
-    s = qBound( 0, ( qrand() % ( safeSatMax - safeSatMin + 1 ) ) + safeValMax, 255 );
+    s = qBound( 0, ( qrand() % ( safeSatMax - safeSatMin + 1 ) ) + safeSatMin, 255 );
     v = qBound( 0, ( qrand() % ( safeValMax - safeValMin + 1 ) ) + safeValMin, 255 );
     colors.append( QColor::fromHsv( h, s, v ) );
   }

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ QList<QColor> QgsVectorRandomColorRampV2::randomColors( int count,`
`346`	`346`	`currentHueAngle += 137.50776;`
`347`	`347`	`//scale hue to between hueMax and hueMin`
`348`	`348`	`h = qBound( 0, qRound(( fmod( currentHueAngle, 360.0 ) / 360.0 ) * ( safeHueMax - safeHueMin ) + safeHueMin ), 359 );`
`349`		`- s = qBound( 0, ( qrand() % ( safeSatMax - safeSatMin + 1 ) ) + safeValMax, 255 );`
	`349`	`+ s = qBound( 0, ( qrand() % ( safeSatMax - safeSatMin + 1 ) ) + safeSatMin, 255 );`
`350`	`350`	`v = qBound( 0, ( qrand() % ( safeValMax - safeValMin + 1 ) ) + safeValMin, 255 );`
`351`	`351`	`colors.append( QColor::fromHsv( h, s, v ) );`
`352`	`352`	`}`