[QGIS Commit] r9691 - in trunk/qgis: python/gui src/app src/app/legend src/gui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2008-11-24 05:15:34 -0500 (Mon, 24 Nov 2008)
New Revision: 9691

Modified:
   trunk/qgis/python/gui/qgsmapcanvas.sip
   trunk/qgis/src/app/legend/qgslegend.cpp
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/gui/qgsmapcanvas.cpp
   trunk/qgis/src/gui/qgsmapcanvas.h
Log:
Renamed ambiguous functions QgsMapCanvas::zoom to zoomIn, zoomOut and zoomByFactor.


Modified: trunk/qgis/python/gui/qgsmapcanvas.sip
===================================================================
--- trunk/qgis/python/gui/qgsmapcanvas.sip	2008-11-24 09:34:57 UTC (rev 9690)
+++ trunk/qgis/python/gui/qgsmapcanvas.sip	2008-11-24 10:15:34 UTC (rev 9691)
@@ -155,9 +155,15 @@
     //! set wheel action and zoom factor (should be greater than 1)
     void setWheelAction(WheelAction action, double factor = 2);
 
-    //! Zooms in/out preserving
-    void zoom(bool zoomIn);
+    //! Zoom in with fixed factor
+    void zoomIn( );
 
+    //! Zoom out with fixed factor
+    void zoomOut( );
+    
+    //! Zoom with the factor supplied. Factor > 1 zooms in
+    void zoomByFactor( double scaleFactor );
+
     //! Zooms in/out with a given center
     void zoomWithCenter(int x, int y, bool zoomIn);
 

Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp	2008-11-24 09:34:57 UTC (rev 9690)
+++ trunk/qgis/src/app/legend/qgslegend.cpp	2008-11-24 10:15:34 UTC (rev 9691)
@@ -1821,7 +1821,7 @@
     QgsDebugMsg( "Raster units per pixel  : " + QString::number( layer->rasterUnitsPerPixel() ) );
     QgsDebugMsg( "MapUnitsPerPixel before : " + QString::number( mMapCanvas->mapUnitsPerPixel() ) );
 
-    mMapCanvas->zoom( fabs( layer->rasterUnitsPerPixel() / mMapCanvas->mapUnitsPerPixel() ) );
+    mMapCanvas->zoomByFactor( fabs( layer->rasterUnitsPerPixel() / mMapCanvas->mapUnitsPerPixel() ) );
     mMapCanvas->refresh();
 
     QgsDebugMsg( "MapUnitsPerPixel after  : " + QString::number( mMapCanvas->mapUnitsPerPixel() ) );

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-11-24 09:34:57 UTC (rev 9690)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-11-24 10:15:34 UTC (rev 9691)
@@ -3980,7 +3980,7 @@
     if ( leftSide > 0.0 && leftOk && rightOk )
     {
       double wantedScale = rightSide / leftSide;
-      mMapCanvas->zoom( wantedScale / currentScale );
+      mMapCanvas->zoomByFactor( wantedScale / currentScale );
     }
   }
 }

Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp	2008-11-24 09:34:57 UTC (rev 9690)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp	2008-11-24 10:15:34 UTC (rev 9691)
@@ -658,12 +658,12 @@
 
       case Qt::Key_PageUp:
         QgsDebugMsg( "Zoom in" );
-        zoom( true );
+        zoomIn();
         break;
 
       case Qt::Key_PageDown:
         QgsDebugMsg( "Zoom out" );
-        zoom( false );
+        zoomOut();
         break;
 
       default:
@@ -860,7 +860,10 @@
   {
     case WheelZoom:
       // zoom without changing extent
-      zoom( e->delta() > 0 );
+      if (e->delta() > 0)
+        zoomIn();
+      else
+        zoomOut();
       break;
 
     case WheelZoomAndRecenter:
@@ -898,14 +901,14 @@
   mWheelZoomFactor = factor;
 }
 
-void QgsMapCanvas::zoom( bool zoomIn )
+void QgsMapCanvas::zoomIn()
 {
-  double scaleFactor = ( zoomIn ? 1 / mWheelZoomFactor : mWheelZoomFactor );
+  zoomByFactor( 1 / mWheelZoomFactor );
+}
 
-  QgsRectangle r = mMapRenderer->extent();
-  r.scale( scaleFactor );
-  setExtent( r );
-  refresh();
+void QgsMapCanvas::zoomOut()
+{
+  zoomByFactor( mWheelZoomFactor );
 }
 
 void QgsMapCanvas::zoomWithCenter( int x, int y, bool zoomIn )
@@ -1265,7 +1268,7 @@
 
 }
 
-void QgsMapCanvas::zoom( double scaleFactor )
+void QgsMapCanvas::zoomByFactor( double scaleFactor )
 {
   if ( mDrawing )
   {

Modified: trunk/qgis/src/gui/qgsmapcanvas.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.h	2008-11-24 09:34:57 UTC (rev 9690)
+++ trunk/qgis/src/gui/qgsmapcanvas.h	2008-11-24 10:15:34 UTC (rev 9691)
@@ -210,9 +210,15 @@
     //! set wheel action and zoom factor (should be greater than 1)
     void setWheelAction( WheelAction action, double factor = 2 );
 
-    //! Zooms in/out preserving
-    void zoom( bool zoomIn );
+    //! Zoom in with fixed factor
+    void zoomIn( );
 
+    //! Zoom out with fixed factor
+    void zoomOut( );
+    
+    //! Zoom with the factor supplied. Factor > 1 zooms in
+    void zoomByFactor( double scaleFactor );
+
     //! Zooms in/out with a given center
     void zoomWithCenter( int x, int y, bool zoomIn );
 
@@ -233,9 +239,6 @@
     //! returns last position of mouse cursor
     QPoint mouseLastXY();
 
-    //! zooms with the factor supplied. Factor > 1 zooms in
-    void zoom( double scaleFactor );
-
   public slots:
 
     /**Repaints the canvas map*/