Use qgsRound in some more places

nyalldawson · nyalldawson · commit 0da1e33110d9 · 2018-09-19T09:01:22.000+10:00
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -3403,8 +3403,7 @@ static QVariant fcnRound( const QVariantList &values, const QgsExpressionContext
   if ( values.length() == 2 && values.at( 1 ).toInt() != 0 )
   {
     double number = QgsExpressionUtils::getDoubleValue( values.at( 0 ), parent );
-    double scaler = std::pow( 10.0, QgsExpressionUtils::getIntValue( values.at( 1 ), parent ) );
-    return QVariant( std::round( number * scaler ) / scaler );
+    return qgsRound( number, QgsExpressionUtils::getIntValue( values.at( 1 ), parent ) );
   }
 
   if ( values.length() >= 1 )
diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp
@@ -1376,7 +1376,7 @@ QString QgsLayoutItemMapGrid::gridAnnotationString( double value, QgsLayoutItemM
   {
     QString hemisphere;
 
-    double coordRounded = std::round( value * std::pow( 10.0, mGridAnnotationPrecision ) ) / std::pow( 10.0, mGridAnnotationPrecision );
+    double coordRounded = qgsRound( value, mGridAnnotationPrecision );
     if ( coord == QgsLayoutItemMapGrid::Longitude )
     {
       //don't use E/W suffixes if ambiguous (e.g., 180 degrees)

Original file line number	Diff line number	Diff line change
`@@ -3403,8 +3403,7 @@ static QVariant fcnRound( const QVariantList &values, const QgsExpressionContext`
`3403`	`3403`	`if ( values.length() == 2 && values.at( 1 ).toInt() != 0 )`
`3404`	`3404`	`{`
`3405`	`3405`	`double number = QgsExpressionUtils::getDoubleValue( values.at( 0 ), parent );`
`3406`		`- double scaler = std::pow( 10.0, QgsExpressionUtils::getIntValue( values.at( 1 ), parent ) );`
`3407`		`- return QVariant( std::round( number * scaler ) / scaler );`
	`3406`	`+ return qgsRound( number, QgsExpressionUtils::getIntValue( values.at( 1 ), parent ) );`
`3408`	`3407`	`}`
`3409`	`3408`
`3410`	`3409`	`if ( values.length() >= 1 )`
Original file line number	Diff line number	Diff line change
`@@ -1376,7 +1376,7 @@ QString QgsLayoutItemMapGrid::gridAnnotationString( double value, QgsLayoutItemM`
`1376`	`1376`	`{`
`1377`	`1377`	`QString hemisphere;`
`1378`	`1378`
`1379`		`- double coordRounded = std::round( value * std::pow( 10.0, mGridAnnotationPrecision ) ) / std::pow( 10.0, mGridAnnotationPrecision );`
	`1379`	`+ double coordRounded = qgsRound( value, mGridAnnotationPrecision );`
`1380`	`1380`	`if ( coord == QgsLayoutItemMapGrid::Longitude )`
`1381`	`1381`	`{`
`1382`	`1382`	`//don't use E/W suffixes if ambiguous (e.g., 180 degrees)`