Disable move vertex tool for point layers (fixes bug 979)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8363 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 17, 2008 · 12a709f · 12a709f
1 parent dcec81f
commit 12a709f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4858,7 +4858,11 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)
 	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;

diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -1445,7 +1445,7 @@ bool QgsGeometry::deleteVertexAt(int atVertex)
         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