#9060: use QGis::fromUnitToUnitFactor in QgsComposerScaleBar

ahuarte47 · ahuarte47 · commit 23f6a231b084 · 2014-01-14T20:58:19.000+01:00
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;
   }

Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,11 @@ double QgsComposerScaleBar::mapWidth() const`
`196`	`196`	`double measure = da.measureLine( QgsPoint( composerMapRect.xMinimum(), composerMapRect.yMinimum() ), QgsPoint( composerMapRect.xMaximum(), composerMapRect.yMinimum() ) );`
`197`	`197`	`if ( mUnits == QgsComposerScaleBar::Feet )`
`198`	`198`	`{`
`199`		`- measure /= 0.3048;`
	`199`	`+ measure /= QGis::fromUnitToUnitFactor( QGis::Feet, QGis::Meters );`
`200`	`200`	`}`
`201`	`201`	`else if ( mUnits == QgsComposerScaleBar::NauticalMiles )`
`202`	`202`	`{`
`203`		`- measure /= 1852.0;`
	`203`	`+ measure /= QGis::fromUnitToUnitFactor( QGis::NauticalMiles, QGis::Meters );`
`204`	`204`	`}`
`205`	`205`	`return measure;`
`206`	`206`	`}`