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

g_j_m · g_j_m · commit efdd9ddf46f8 · 2007-03-03T22:22:32.000Z
to have scales larger than 1:2^31 git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6754 c8812cc2-4d05-0410-92ff-de0c093fc19c
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();

Original file line number	Diff line number	Diff line change
`@@ -1172,8 +1172,8 @@ void QgisApp::setupConnections()`
`1172`	`1172`	`connect(mMapCanvas->mapRender(), SIGNAL(projectionsEnabled(bool)), this, SLOT(projectionsEnabled(bool)));`
`1173`	`1173`	`connect(mMapCanvas->mapRender(), SIGNAL(destinationSrsChanged()), this, SLOT(destinationSrsChanged()));`
`1174`	`1174`	`connect(mMapCanvas, SIGNAL(extentsChanged()),this,SLOT(showExtents()));`
`1175`		`- connect(mMapCanvas, SIGNAL(scaleChanged(long)), this, SLOT(showScale(long)));`
`1176`		`- connect(mMapCanvas, SIGNAL(scaleChanged(long)), this, SLOT(updateMouseCoordinatePrecision()));`
	`1175`	`+ connect(mMapCanvas, SIGNAL(scaleChanged(double)), this, SLOT(showScale(double)));`
	`1176`	`+ connect(mMapCanvas, SIGNAL(scaleChanged(double)), this, SLOT(updateMouseCoordinatePrecision()));`
`1177`	`1177`
`1178`	`1178`	`connect(mRenderSuppressionCBox, SIGNAL(toggled(bool )), mMapCanvas, SLOT(setRenderFlag(bool)));`
`1179`	`1179`	`}`
`@@ -3535,10 +3535,14 @@ void QgisApp::showMouseCoordinate(QgsPoint & p)`
`3535`	`3535`	`}`
`3536`	`3536`	`}`
`3537`	`3537`
`3538`		`-void QgisApp::showScale(long theScale)`
	`3538`	`+void QgisApp::showScale(double theScale)`
`3539`	`3539`	`{`
`3540`	`3540`	`mScaleLabel->setText(tr("Scale 1: "));`
`3541`		`- mScaleEdit->setText(QString::number(theScale));`
	`3541`	`+`
	`3542`	`+ if (theScale >= 1.0)`
	`3543`	`+ mScaleEdit->setText(QString::number(theScale, 'f', 0));`
	`3544`	`+ else`
	`3545`	`+ mScaleEdit->setText(QString::number(theScale));`
`3542`	`3546`	`// Set minimum necessary width`
`3543`	`3547`	`if ( mScaleEdit->width() > mScaleEdit->minimumWidth() )`
`3544`	`3548`	`{`
Original file line number	Diff line number	Diff line change
`@@ -432,10 +432,7 @@ void QgsMapCanvas::updateScale()`
`432`	`432`	`{`
`433`	`433`	`double scale = mMapRender->scale();`
`434`	`434`
`435`		`- if (scale < 1)`
`436`		`- emit scaleChanged(lround(-1.0/scale));`
`437`		`- else`
`438`		`- emit scaleChanged(lround(scale));`
	`435`	`+ emit scaleChanged(scale);`
`439`	`436`	`}`
`440`	`437`
`441`	`438`