#9060: use QGis::fromUnitToUnitFactor in QgsComposerScaleBar

qgis · Jan 14, 2014 · 23f6a23 · 23f6a23
1 parent c20f38b
commit 23f6a23
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -196,11 +196,11 @@ double QgsComposerScaleBar::mapWidth() const
     double measure = da.measureLine( QgsPoint( composerMapRect.xMinimum(), composerMapRect.yMinimum() ), QgsPoint( composerMapRect.xMaximum(), composerMapRect.yMinimum() ) );
     if ( mUnits == QgsComposerScaleBar::Feet )
     {
-      measure /= 0.3048;
+      measure /= QGis::fromUnitToUnitFactor( QGis::Feet, QGis::Meters );
     }
     else if ( mUnits == QgsComposerScaleBar::NauticalMiles )
     {
-      measure /= 1852.0;
+      measure /= QGis::fromUnitToUnitFactor( QGis::NauticalMiles, QGis::Meters );
     }
     return measure;
   }