File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -226,14 +226,14 @@ void QgsComposerScaleBar::invalidateCurrentMap()
226
226
// nextNiceNumber(4573.23, d) = 5000 (d=1) -> 4600 (d=10) -> 4580 (d=100) -> 4574 (d=1000) -> etc
227
227
inline double nextNiceNumber ( double a, double d = 1 )
228
228
{
229
- double s = pow10 ( floor ( log10 ( a ) ) ) / d;
229
+ double s = qPow ( 10.0 , floor ( log10 ( a ) ) ) / d;
230
230
return ceil ( a / s ) * s;
231
231
}
232
232
233
233
// prevNiceNumber(4573.23, d) = 4000 (d=1) -> 4500 (d=10) -> 4570 (d=100) -> 4573 (d=1000) -> etc
234
234
inline double prevNiceNumber ( double a, double d = 1 )
235
235
{
236
- double s = pow10 ( floor ( log10 ( a ) ) ) / d;
236
+ double s = qPow ( 10.0 , floor ( log10 ( a ) ) ) / d;
237
237
return floor ( a / s ) * s;
238
238
}
239
239
@@ -455,7 +455,7 @@ void QgsComposerScaleBar::applyDefaultSize( QgsComposerScaleBar::ScaleBarUnits u
455
455
456
456
double segmentWidth = initialUnitsPerSegment / upperMagnitudeMultiplier;
457
457
int segmentMagnitude = floor ( log10 ( segmentWidth ) );
458
- double unitsPerSegment = upperMagnitudeMultiplier * ( pow ( 10.0 , segmentMagnitude ) );
458
+ double unitsPerSegment = upperMagnitudeMultiplier * ( qPow ( 10.0 , segmentMagnitude ) );
459
459
double multiplier = floor (( widthInSelectedUnits / ( unitsPerSegment * 10.0 ) ) / 2.5 ) * 2.5 ;
460
460
461
461
if ( multiplier > 0 )
You can’t perform that action at this time.
0 commit comments