sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

replace pow10 with qPow (fixes #12717)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-05-08 01:14:29 +02:00
parent 656af530c3
commit 2c3855267e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/composer/qgscomposerscalebar.cpp
View File

@ -226,14 +226,14 @@ void QgsComposerScaleBar::invalidateCurrentMap()
// nextNiceNumber(4573.23, d) = 5000 (d=1) -> 4600 (d=10) -> 4580 (d=100) -> 4574 (d=1000) -> etc
inline double nextNiceNumber( double a, double d = 1 )
{
double s = pow10( floor( log10( a ) ) ) / d;
double s = qPow( 10.0, floor( log10( a ) ) ) / d;
return ceil( a / s ) * s;
}
// prevNiceNumber(4573.23, d) = 4000 (d=1) -> 4500 (d=10) -> 4570 (d=100) -> 4573 (d=1000) -> etc
inline double prevNiceNumber( double a, double d = 1 )
{
double s = pow10( floor( log10( a ) ) ) / d;
double s = qPow( 10.0, floor( log10( a ) ) ) / d;
return floor( a / s ) * s;
}
@ -455,7 +455,7 @@ void QgsComposerScaleBar::applyDefaultSize( QgsComposerScaleBar::ScaleBarUnits u
double segmentWidth = initialUnitsPerSegment / upperMagnitudeMultiplier;
int segmentMagnitude = floor( log10( segmentWidth ) );
double unitsPerSegment = upperMagnitudeMultiplier * ( pow( 10.0, segmentMagnitude ) );
double unitsPerSegment = upperMagnitudeMultiplier * ( qPow( 10.0, segmentMagnitude ) );
double multiplier = floor(( widthInSelectedUnits / ( unitsPerSegment * 10.0 ) ) / 2.5 ) * 2.5;
if ( multiplier > 0 )