[QGIS Commit] r14242 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2010-09-16 22:58:08 +0000 (Thu, 16 Sep 2010)
New Revision: 14242

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Applied patch from #3005 - allow entry of scale without leading 1:

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-09-16 22:52:26 UTC (rev 14241)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-09-16 22:58:08 UTC (rev 14242)
@@ -1847,7 +1847,8 @@
   mScaleEdit->setMaximumHeight( 20 );
   mScaleEdit->setContentsMargins( 0, 0, 0, 0 );
   mScaleEdit->setAlignment( Qt::AlignLeft );
-  QRegExp validator( "\\d+\\.?\\d*:\\d+\\.?\\d*" );
+  // QRegExp validator( "\\d+\\.?\\d*:\\d+\\.?\\d*" );
+  QRegExp validator( "\\d+\\.?\\d*:\\d+\\.?\\d*|\\d+\\.?\\d*" );
   mScaleEditValidator = new QRegExpValidator( validator, mScaleEdit );
   mScaleEdit->setValidator( mScaleEditValidator );
   mScaleEdit->setWhatsThis( tr( "Displays the current map scale" ) );
@@ -4932,6 +4933,15 @@
       mMapCanvas->zoomScale( rightSide / leftSide );
     }
   }
+  else
+  {
+    bool rightOk;
+    double rightSide = parts.at( 0 ).toDouble( &rightOk );
+    if ( rightOk )
+    {
+      mMapCanvas->zoomScale( rightSide );
+    }
+  } 
 }
 
 void QgisApp::userCenter()