Write scales in composer not in exponential notation

mhugent · mhugent · commit 8520ec52c8d6 · 2008-08-26T09:16:13.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9173 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -200,7 +200,7 @@ void QgsComposerMapWidget::updateGuiElements()
     QRectF composerMapRect = mComposerMap->rect();
     mWidthLineEdit->setText( QString::number( composerMapRect.width() ) );
     mHeightLineEdit->setText( QString::number( composerMapRect.height() ) );
-    mScaleLineEdit->setText( QString::number( mComposerMap->scale() ) );
+    mScaleLineEdit->setText( QString::number( mComposerMap->scale(), 'f', 0) );
 
     //preview mode
     QgsComposerMap::PreviewMode previewMode = mComposerMap->previewMode();
diff --git a/src/core/composer/qgsnumericscalebarstyle.cpp b/src/core/composer/qgsnumericscalebarstyle.cpp
@@ -80,7 +80,7 @@ QString QgsNumericScaleBarStyle::scaleText() const
     if ( composerMap )
     {
       double scaleDenominator = composerMap->scale();
-      scaleBarText = "1:" + QString::number( scaleDenominator );
+      scaleBarText = "1:" + QString::number(scaleDenominator, 'f', 0);
     }
   }
   return scaleBarText;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ QString QgsNumericScaleBarStyle::scaleText() const`
`80`	`80`	`if ( composerMap )`
`81`	`81`	`{`
`82`	`82`	`double scaleDenominator = composerMap->scale();`
`83`		`- scaleBarText = "1:" + QString::number( scaleDenominator );`
	`83`	`+ scaleBarText = "1:" + QString::number(scaleDenominator, 'f', 0);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`return scaleBarText;`