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

mhugent · mhugent · commit b21a661a97cf · 2008-04-17T13:12:08.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8363 c8812cc2-4d05-0410-92ff-de0c093fc19c
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

Original file line number	Diff line number	Diff line change
`@@ -4858,7 +4858,11 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)`
`4858`	`4858`	`mActionSplitFeatures->setEnabled(false);`
`4859`	`4859`	`if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries)`
`4860`	`4860`	`{`
`4861`		`- mActionMoveVertex->setEnabled(true);`
	`4861`	`+ //don't enable vertex move for single point`
	`4862`	`+ if(vlayer->geometryType() != QGis::WKBPoint && vlayer->geometryType() != QGis::WKBPoint25D)`
	`4863`	`+ {`
	`4864`	`+ mActionMoveVertex->setEnabled(true);`
	`4865`	`+ }`
`4862`	`4866`	`mActionMoveFeature->setEnabled(true);`
`4863`	`4867`	`}`
`4864`	`4868`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1445,7 +1445,7 @@ bool QgsGeometry::deleteVertexAt(int atVertex)`
`1445`	`1445`	`int* nPoints = (int*)ptr;`
`1446`	`1446`	`if((nPoints) < 3 \|\| vertexnr > (nPoints)-1 \|\| vertexnr < 0) //line needs at least 2 vertices`
`1447`	`1447`	`{`
`1448`		`- delete newbuffer;`
	`1448`	`+ delete newbuffer;`
`1449`	`1449`	`return false;`
`1450`	`1450`	`}`
`1451`	`1451`	`int newNPoints = (*nPoints)-1; //new number of points`