Initial addition of routines for Add and Move Vertex in QgsMapCanvas. Add Vertex is more advanced than Move Vertex but still isn't quite working yet. Still needs to be wired up to the UI anyway.

Also, when adding the new map tool enumerations into the Qgis namespace, also added "NoTool" at enumeration 0.  This will be needed because currently the map tool is not being properly initialised at QGIS startup.  A future commit will address this fully and should also eventually be applied to cvs 0.7 branch.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3505 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/qgis.h

@@ -47,6 +47,7 @@ namespace QGis
   // Maptool enumeration
   enum MapTools
   {
+    NoTool,
     ZoomIn,
     ZoomOut,
     Pan,
@@ -58,7 +59,9 @@ namespace QGis
     CaptureLine,
     CapturePolygon,
     EmitPoint,
-    Measure
+    Measure,
+    AddVertex,
+    MoveVertex
   };
   //! Used for symbology operations
   // Featuure types

src/qgsmapcanvas.h

@@ -396,7 +396,8 @@ private:
     //! Updates the z order for layers on the map
     void updateZpos();
 
-
+    //! Zooms to a given center and scale 
+    void zoomByScale(int x, int y, double scaleFactor);
 
     //! detrmines whether the user can interact with the canvas using a mouse
     //(useful for locking the overview canvas)
@@ -414,6 +415,11 @@ private:
 
     //! Measure tool
     QgsMeasure *mMeasure;
+    
+    //! Scale factor multiple for default zoom in/out
+    // TODO Make this customisable by the user
+    static const double scaleDefaultMultiple = 2.0;
+    
 }; // class QgsMapCanvas
 
 #endif