apply #2712 and #2716 with slight modification. Thanks to Charles Timko.

jef · jef · commit e88a80afc845 · 2010-05-17T16:35:55.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13517 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -170,6 +170,10 @@ class QgsMapCanvas : QGraphicsView
 
     //! Zoom out with fixed factor
     void zoomOut( );
+
+    //! Zoom to a specific scale
+    // added in 1.5
+    void zoomScale( double scale );
     
     //! Zoom with the factor supplied. Factor > 1 zooms in
     void zoomByFactor( double scaleFactor );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1220,6 +1220,12 @@ void QgisApp::showPythonDialog()
     mPythonUtils->getError( className, text );
     QMessageBox::critical( this, tr( "Error" ), tr( "Failed to open Python console:" ) + "\n" + className + ": " + text );
   }
+#ifdef Q_WS_MAC
+  else
+  {
+    addWindow( mActionShowPythonDialog );
+  }
+#endif
 }
 
 void QgisApp::createActionGroups()
@@ -4779,8 +4785,6 @@ void QgisApp::showScale( double theScale )
 
 void QgisApp::userScale()
 {
-  double currentScale = mMapCanvas->scale();
-
   QStringList parts = mScaleEdit->text().split( ':' );
   if ( parts.size() == 2 )
   {
@@ -4789,8 +4793,7 @@ void QgisApp::userScale()
     double rightSide = parts.at( 1 ).toDouble( &rightOk );
     if ( leftSide > 0.0 && leftOk && rightOk )
     {
-      double wantedScale = rightSide / leftSide;
-      mMapCanvas->zoomByFactor( wantedScale / currentScale );
+      mMapCanvas->zoomScale( rightSide / leftSide );
     }
   }
 }
@@ -4998,7 +5001,6 @@ void QgisApp::loadPythonSupport()
     mActionPluginSeparator2 = mPluginMenu->addSeparator();
     mPluginMenu->addAction( mActionShowPythonDialog );
     std::cout << "Python support ENABLED :-) " << std::endl; // OK
-
   }
 }
 
@@ -5255,7 +5257,7 @@ QgsVectorLayer* QgisApp::addVectorLayer( QString vectorLayerPath, QString baseNa
   else
   {
     QMessageBox::critical( this, tr( "Layer is not valid" ),
-                           tr( "The layer is not a valid layer and can not be added to the map" ) );
+                           tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath ) );
 
     delete layer;
     mMapCanvas->freeze( false );
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1057,6 +1057,11 @@ void QgsMapCanvas::zoomOut()
   zoomByFactor( mWheelZoomFactor );
 }
 
+void QgsMapCanvas::zoomScale( double newScale )
+{
+  zoomByFactor( newScale / scale() );
+}
+
 void QgsMapCanvas::zoomWithCenter( int x, int y, bool zoomIn )
 {
   if ( mDrawing )
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -228,6 +228,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     //! Zoom out with fixed factor
     void zoomOut( );
 
+    //! Zoom to a specific scale
+    // added in 1.5
+    void zoomScale( double scale );
+
     //! Zoom with the factor supplied. Factor > 1 zooms out, interval (0,1) zooms in
     void zoomByFactor( double scaleFactor );
 

Original file line number	Diff line number	Diff line change
`@@ -1220,6 +1220,12 @@ void QgisApp::showPythonDialog()`
`1220`	`1220`	`mPythonUtils->getError( className, text );`
`1221`	`1221`	`QMessageBox::critical( this, tr( "Error" ), tr( "Failed to open Python console:" ) + "\n" + className + ": " + text );`
`1222`	`1222`	`}`
	`1223`	`+#ifdef Q_WS_MAC`
	`1224`	`+ else`
	`1225`	`+ {`
	`1226`	`+ addWindow( mActionShowPythonDialog );`
	`1227`	`+ }`
	`1228`	`+#endif`
`1223`	`1229`	`}`
`1224`	`1230`
`1225`	`1231`	`void QgisApp::createActionGroups()`
`@@ -4779,8 +4785,6 @@ void QgisApp::showScale( double theScale )`
`4779`	`4785`
`4780`	`4786`	`void QgisApp::userScale()`
`4781`	`4787`	`{`
`4782`		`- double currentScale = mMapCanvas->scale();`
`4783`		`-`
`4784`	`4788`	`QStringList parts = mScaleEdit->text().split( ':' );`
`4785`	`4789`	`if ( parts.size() == 2 )`
`4786`	`4790`	`{`
`@@ -4789,8 +4793,7 @@ void QgisApp::userScale()`
`4789`	`4793`	`double rightSide = parts.at( 1 ).toDouble( &rightOk );`
`4790`	`4794`	`if ( leftSide > 0.0 && leftOk && rightOk )`
`4791`	`4795`	`{`
`4792`		`- double wantedScale = rightSide / leftSide;`
`4793`		`- mMapCanvas->zoomByFactor( wantedScale / currentScale );`
	`4796`	`+ mMapCanvas->zoomScale( rightSide / leftSide );`
`4794`	`4797`	`}`
`4795`	`4798`	`}`
`4796`	`4799`	`}`
`@@ -4998,7 +5001,6 @@ void QgisApp::loadPythonSupport()`
`4998`	`5001`	`mActionPluginSeparator2 = mPluginMenu->addSeparator();`
`4999`	`5002`	`mPluginMenu->addAction( mActionShowPythonDialog );`
`5000`	`5003`	`std::cout << "Python support ENABLED :-) " << std::endl; // OK`
`5001`		`-`
`5002`	`5004`	`}`
`5003`	`5005`	`}`
`5004`	`5006`
`@@ -5255,7 +5257,7 @@ QgsVectorLayer* QgisApp::addVectorLayer( QString vectorLayerPath, QString baseNa`
`5255`	`5257`	`else`
`5256`	`5258`	`{`
`5257`	`5259`	`QMessageBox::critical( this, tr( "Layer is not valid" ),`
`5258`		`- tr( "The layer is not a valid layer and can not be added to the map" ) );`
	`5260`	`+ tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath ) );`
`5259`	`5261`
`5260`	`5262`	`delete layer;`
`5261`	`5263`	`mMapCanvas->freeze( false );`
Original file line number	Diff line number	Diff line change
`@@ -1057,6 +1057,11 @@ void QgsMapCanvas::zoomOut()`
`1057`	`1057`	`zoomByFactor( mWheelZoomFactor );`
`1058`	`1058`	`}`
`1059`	`1059`
	`1060`	`+void QgsMapCanvas::zoomScale( double newScale )`
	`1061`	`+{`
	`1062`	`+ zoomByFactor( newScale / scale() );`
	`1063`	`+}`
	`1064`	`+`
`1060`	`1065`	`void QgsMapCanvas::zoomWithCenter( int x, int y, bool zoomIn )`
`1061`	`1066`	`{`
`1062`	`1067`	`if ( mDrawing )`