[QGIS Commit] r8363 - in trunk/qgis/src: app core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-04-17 09:12:08 -0400 (Thu, 17 Apr 2008)
New Revision: 8363

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/core/qgsgeometry.cpp
Log:
Disable move vertex tool for point layers (fixes bug 979)

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-04-17 12:59:33 UTC (rev 8362)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-04-17 13:12:08 UTC (rev 8363)
@@ -4858,7 +4858,11 @@
 	mActionSplitFeatures->setEnabled(false);
         if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries)
         {
-          mActionMoveVertex->setEnabled(true);
+	  //don't enable vertex move for single point
+	  if(vlayer->geometryType() != QGis::WKBPoint && vlayer->geometryType() != QGis::WKBPoint25D)
+	    {
+	      mActionMoveVertex->setEnabled(true);
+	    }
           mActionMoveFeature->setEnabled(true);
         }
         return;

Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp	2008-04-17 12:59:33 UTC (rev 8362)
+++ trunk/qgis/src/core/qgsgeometry.cpp	2008-04-17 13:12:08 UTC (rev 8363)
@@ -1445,7 +1445,7 @@
         int* nPoints = (int*)ptr;
         if((*nPoints) < 3 || vertexnr > (*nPoints)-1 || vertexnr < 0) //line needs at least 2 vertices
         {
-          delete newbuffer;
+	  delete newbuffer;
           return false;
         }
         int newNPoints = (*nPoints)-1; //new number of points