can re-center when scaling mapCanvas extent

3nids · 3nids · commit a9289b6a9021 · 2014-07-25T14:28:11.000+02:00
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -238,7 +238,8 @@ class QgsMapCanvas : QGraphicsView
     void zoomScale( double scale );
 
     //! Zoom with the factor supplied. Factor > 1 zooms out, interval (0,1) zooms in
-    void zoomByFactor( double scaleFactor );
+    //! If point is given, re-center on it
+    void zoomByFactor( double scaleFactor, const QgsPoint *center = 0 );
 
     //! Zooms in/out with a given center
     void zoomWithCenter( int x, int y, bool zoomIn );
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1815,10 +1815,10 @@ void QgsMapCanvas::getDatumTransformInfo( const QgsMapLayer* ml, const QString&
   }
 }
 
-void QgsMapCanvas::zoomByFactor( double scaleFactor )
+void QgsMapCanvas::zoomByFactor( double scaleFactor , const QgsPoint* center )
 {
   QgsRectangle r = mapSettings().visibleExtent();
-  r.scale( scaleFactor );
+  r.scale( scaleFactor, center );
   setExtent( r );
   refresh();
 }
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -307,7 +307,8 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     void zoomScale( double scale );
 
     //! Zoom with the factor supplied. Factor > 1 zooms out, interval (0,1) zooms in
-    void zoomByFactor( double scaleFactor );
+    //! If point is given, re-center on it
+    void zoomByFactor( double scaleFactor, const QgsPoint *center = 0 );
 
     //! Zooms in/out with a given center
     void zoomWithCenter( int x, int y, bool zoomIn );

Original file line number	Diff line number	Diff line change
`@@ -1815,10 +1815,10 @@ void QgsMapCanvas::getDatumTransformInfo( const QgsMapLayer* ml, const QString&`
`1815`	`1815`	`}`
`1816`	`1816`	`}`
`1817`	`1817`
`1818`		`-void QgsMapCanvas::zoomByFactor( double scaleFactor )`
	`1818`	`+void QgsMapCanvas::zoomByFactor( double scaleFactor , const QgsPoint* center )`
`1819`	`1819`	`{`
`1820`	`1820`	`QgsRectangle r = mapSettings().visibleExtent();`
`1821`		`- r.scale( scaleFactor );`
	`1821`	`+ r.scale( scaleFactor, center );`
`1822`	`1822`	`setExtent( r );`
`1823`	`1823`	`refresh();`
`1824`	`1824`	`}`