Applied patch from #3005 - allow entry of scale without leading 1:

git-svn-id: http://svn.osgeo.org/qgis/trunk@14242 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 16, 2010 · 6d350ff · 6d350ff
1 parent e9f245d
commit 6d350ff
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1847,7 +1847,8 @@ void QgisApp::createStatusBar()
   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 @@ void QgisApp::userScale()
       mMapCanvas->zoomScale( rightSide / leftSide );
     }
   }
+  else
+  {
+    bool rightOk;
+    double rightSide = parts.at( 0 ).toDouble( &rightOk );
+    if ( rightOk )
+    {
+      mMapCanvas->zoomScale( rightSide );
+    }
+  } 
 }
 
 void QgisApp::userCenter()