Tweak to r6747 to allow the user to enter non-integer scale values, and

to have scales larger than 1:2^31 git-svn-id: http://svn.osgeo.org/qgis/trunk@6754 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 3, 2007 · f96509c · f96509c
1 parent d98dcff
commit f96509c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1172,8 +1172,8 @@ void QgisApp::setupConnections()
   connect(mMapCanvas->mapRender(), SIGNAL(projectionsEnabled(bool)), this, SLOT(projectionsEnabled(bool)));
   connect(mMapCanvas->mapRender(), SIGNAL(destinationSrsChanged()), this, SLOT(destinationSrsChanged()));
   connect(mMapCanvas, SIGNAL(extentsChanged()),this,SLOT(showExtents()));
-  connect(mMapCanvas, SIGNAL(scaleChanged(long)), this, SLOT(showScale(long)));
-  connect(mMapCanvas, SIGNAL(scaleChanged(long)), this, SLOT(updateMouseCoordinatePrecision()));
+  connect(mMapCanvas, SIGNAL(scaleChanged(double)), this, SLOT(showScale(double)));
+  connect(mMapCanvas, SIGNAL(scaleChanged(double)), this, SLOT(updateMouseCoordinatePrecision()));
 
   connect(mRenderSuppressionCBox, SIGNAL(toggled(bool )), mMapCanvas, SLOT(setRenderFlag(bool)));
 }
@@ -3535,10 +3535,14 @@ void QgisApp::showMouseCoordinate(QgsPoint & p)
   }
 }
 
-void QgisApp::showScale(long theScale)
+void QgisApp::showScale(double theScale)
 {
   mScaleLabel->setText(tr("Scale 1: "));
-  mScaleEdit->setText(QString::number(theScale));
+
+  if (theScale >= 1.0)
+    mScaleEdit->setText(QString::number(theScale, 'f', 0));
+  else
+    mScaleEdit->setText(QString::number(theScale));
   // Set minimum necessary width
   if ( mScaleEdit->width() > mScaleEdit->minimumWidth() )
   {

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -175,7 +175,7 @@ public slots:
   //copy the click coord to clipboard and let the user know its there
   void showCapturePointCoordinate(QgsPoint &);
   //! Slot to show current map scale;
-  void showScale(long theScale);
+  void showScale(double theScale);
   //! Slot to handle user scale input;
   void userScale();
   //! Remove a layer from the map and legend

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -432,10 +432,7 @@ void QgsMapCanvas::updateScale()
 {
   double scale = mMapRender->scale();
 
-  if (scale < 1)
-    emit scaleChanged(lround(-1.0/scale));
-  else 
-    emit scaleChanged(lround(scale));
+  emit scaleChanged(scale);
 }
 
 

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -277,7 +277,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     void xyCoordinates(QgsPoint & p);
 
     //! Emitted when the scale of the map changes
-    void scaleChanged(long);
+    void scaleChanged(double);
 
     //! Emitted when the extents of the map change
     void extentsChanged();