Fix context menu options for graduated ranges does nothing

nyalldawson · nyalldawson · commit 06343776d382 · 2016-06-27T15:40:29.000+10:00
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -1082,10 +1082,14 @@ QList<QgsSymbolV2*> QgsGraduatedSymbolRendererV2Widget::selectedSymbols()
 
 QgsSymbolV2* QgsGraduatedSymbolRendererV2Widget::findSymbolForRange( double lowerBound, double upperBound, const QgsRangeList& ranges ) const
 {
+  int decimalPlaces = mRenderer->labelFormat().precision() + 2;
+  if ( decimalPlaces < 0 )
+    decimalPlaces = 0;
+  double precision = 1.0 / qPow( 10, decimalPlaces );
+
   for ( QgsRangeList::const_iterator it = ranges.begin(); it != ranges.end(); ++it )
   {
-    //range string has been created with option 'f',4
-    if ( qgsDoubleNear( lowerBound, it->lowerValue(), 0.0001 ) && qgsDoubleNear( upperBound, it->upperValue(), 0.0001 ) )
+    if ( qgsDoubleNear( lowerBound, it->lowerValue(), precision ) && qgsDoubleNear( upperBound, it->upperValue(), precision ) )
     {
       return it->symbol();
     }

Original file line number	Diff line number	Diff line change
`@@ -1082,10 +1082,14 @@ QList<QgsSymbolV2*> QgsGraduatedSymbolRendererV2Widget::selectedSymbols()`
`1082`	`1082`
`1083`	`1083`	`QgsSymbolV2* QgsGraduatedSymbolRendererV2Widget::findSymbolForRange( double lowerBound, double upperBound, const QgsRangeList& ranges ) const`
`1084`	`1084`	`{`
	`1085`	`+ int decimalPlaces = mRenderer->labelFormat().precision() + 2;`
	`1086`	`+ if ( decimalPlaces < 0 )`
	`1087`	`+ decimalPlaces = 0;`
	`1088`	`+ double precision = 1.0 / qPow( 10, decimalPlaces );`
	`1089`	`+`
`1085`	`1090`	`for ( QgsRangeList::const_iterator it = ranges.begin(); it != ranges.end(); ++it )`
`1086`	`1091`	`{`
`1087`		`- //range string has been created with option 'f',4`
`1088`		`- if ( qgsDoubleNear( lowerBound, it->lowerValue(), 0.0001 ) && qgsDoubleNear( upperBound, it->upperValue(), 0.0001 ) )`
	`1092`	`+ if ( qgsDoubleNear( lowerBound, it->lowerValue(), precision ) && qgsDoubleNear( upperBound, it->upperValue(), precision ) )`
`1089`	`1093`	`{`
`1090`	`1094`	`return it->symbol();`
`1091`	`1095`	`}`