Update highlighted nodes when features are changed or deleted

qgis · Apr 6, 2017 · f004468 · f004468
1 parent d1f23e9
commit f004468
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/app/nodetool/qgsnodetool2.cpp b/src/app/nodetool/qgsnodetool2.cpp
@@ -842,6 +842,9 @@ void QgsNodeTool2::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry
   QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];
   if ( layerCache.contains( fid ) )
     layerCache[fid] = geom;
+
+  // refresh highlighted nodes - their position may have changed
+  setHighlightedNodes( mSelectedNodes );
 }
 
 void QgsNodeTool2::onCachedGeometryDeleted( QgsFeatureId fid )
@@ -851,6 +854,9 @@ void QgsNodeTool2::onCachedGeometryDeleted( QgsFeatureId fid )
   QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];
   if ( layerCache.contains( fid ) )
     layerCache.remove( fid );
+
+  // refresh highlighted nodes - some may have been deleted
+  setHighlightedNodes( mSelectedNodes );
 }
 
 
@@ -1518,23 +1524,27 @@ void QgsNodeTool2::deleteVertex()
 
 }
 
-void QgsNodeTool2::setHighlightedNodes( const QList<Vertex> &listNodes )
+void QgsNodeTool2::setHighlightedNodes( QList<Vertex> listNodes )
 {
   qDeleteAll( mSelectedNodesMarkers );
   mSelectedNodesMarkers.clear();
+  mSelectedNodes.clear();
 
   Q_FOREACH ( const Vertex &node, listNodes )
   {
     QgsGeometry geom = cachedGeometryForVertex( node );
+    QgsVertexId vid;
+    if ( !geom.vertexIdFromVertexNr( node.vertexId, vid ) )
+      continue;  // node may not exist anymore
     QgsVertexMarker *marker = new QgsVertexMarker( canvas() );
     marker->setIconType( QgsVertexMarker::ICON_CIRCLE );
     marker->setPenWidth( 3 );
     marker->setColor( Qt::blue );
     marker->setFillColor( Qt::blue );
     marker->setCenter( toMapCoordinates( node.layer, geom.vertexAt( node.vertexId ) ) );
+    mSelectedNodes.append( node );
     mSelectedNodesMarkers.append( marker );
   }
-  mSelectedNodes = listNodes;
 }
 
 void QgsNodeTool2::setHighlightedNodesVisible( bool visible )

diff --git a/src/app/nodetool/qgsnodetool2.h b/src/app/nodetool/qgsnodetool2.h
@@ -155,7 +155,7 @@ class APP_EXPORT QgsNodeTool2 : public QgsMapToolAdvancedDigitizing
 
     void applyEditsToLayers( NodeEdits &edits );
 
-    void setHighlightedNodes( const QList<Vertex> &listNodes );
+    void setHighlightedNodes( QList<Vertex> listNodes );
 
     void setHighlightedNodesVisible( bool visible );