#9094: Auto-select adjacent last-removed node

ahuarte47 · ahuarte47 · commit 5bda2dfed968 · 2013-12-18T00:51:28.000+01:00
Automatically selects the adjacent vertex to last removed selected node
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -713,7 +713,11 @@ void QgsMapToolNodeTool::keyReleaseEvent( QKeyEvent* e )
 
   if ( mSelectedFeature && ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete ) )
   {
+    int firstSelectedIndex = firstSelectedVertex();
+    if ( firstSelectedIndex == -1) return;
+
     mSelectedFeature->deleteSelectedVertexes();
+    safeSelectVertex( firstSelectedIndex );
     mCanvas->refresh();
   }
 }
@@ -731,3 +735,37 @@ QgsRubberBand* QgsMapToolNodeTool::createRubberBandMarker( QgsPoint center, QgsV
   marker->addPoint( pom );
   return marker;
 }
+
+int QgsMapToolNodeTool::firstSelectedVertex( )
+{
+  if ( mSelectedFeature )
+  {
+    QList<QgsVertexEntry*> &vertexMap = mSelectedFeature->vertexMap();
+    int vertexNr = 0;
+
+    foreach ( QgsVertexEntry *entry, vertexMap )
+    {
+      if ( entry->isSelected() )
+      {
+        return vertexNr;
+      }
+      vertexNr++;
+    }
+  }
+  return -1;
+}
+
+int QgsMapToolNodeTool::safeSelectVertex( int vertexNr )
+{
+  if ( mSelectedFeature )
+  {
+     QList<QgsVertexEntry*> &vertexMap = mSelectedFeature->vertexMap();
+
+     if ( vertexNr >= vertexMap.size() ) vertexNr -= vertexMap.size();
+     if ( vertexNr < 0 ) vertexNr = vertexMap.size() - 1 + vertexNr;
+
+     mSelectedFeature->selectVertex( vertexNr );
+     return vertexNr;
+  }
+  return -1;
+}
diff --git a/src/app/nodetool/qgsmaptoolnodetool.h b/src/app/nodetool/qgsmaptoolnodetool.h
@@ -95,6 +95,16 @@ class QgsMapToolNodeTool: public QgsMapToolVertexEdit
      */
     void createTopologyRubberBands( QgsVectorLayer* vlayer, const QList<QgsVertexEntry*> &vertexMap, int vertex );
 
+    /**
+     * Returns the index of first selected vertex, -1 when all unselected
+     */
+    int firstSelectedVertex( );
+
+    /**
+     * Select the specified vertex bounded to current index range, returns the valid selected index
+     */
+    int safeSelectVertex( int vertexNr );
+
     /** The position of the vertex to move (in map coordinates) to exclude later from snapping*/
     QList<QgsPoint> mExcludePoint;
 
