[QGIS Commit] r9173 - in trunk/qgis/src: app/composer core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-08-26 05:16:13 -0400 (Tue, 26 Aug 2008)
New Revision: 9173

Modified:
   trunk/qgis/src/app/composer/qgscomposermapwidget.cpp
   trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp
Log:
Write scales in composer not in exponential notation

Modified: trunk/qgis/src/app/composer/qgscomposermapwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposermapwidget.cpp	2008-08-26 08:35:43 UTC (rev 9172)
+++ trunk/qgis/src/app/composer/qgscomposermapwidget.cpp	2008-08-26 09:16:13 UTC (rev 9173)
@@ -200,7 +200,7 @@
     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();

Modified: trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp	2008-08-26 08:35:43 UTC (rev 9172)
+++ trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp	2008-08-26 09:16:13 UTC (rev 9173)
@@ -80,7 +80,7 @@
     if ( composerMap )
     {
       double scaleDenominator = composerMap->scale();
-      scaleBarText = "1:" + QString::number( scaleDenominator );
+      scaleBarText = "1:" + QString::number(scaleDenominator, 'f', 0);
     }
   }
   return scaleBarText;