Merge topic 'seed_widget_delete' into release

585aeb84 Invoke DeletePointEvent before deleting vtkSeedWidget seed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Will Schroeder <will.schroeder@kitware.com>
Merge-request: !4493

Common/Core/vtkCommand.h

@@ -87,6 +87,9 @@
  * - vtkCommand::PlacePointEvent
  *  - Widgets/vtkSeedWidget returns a pointer to an int, being the current
  * handle number
+ * - vtkCommand::DeletePointEvent
+ *  - Widgets/vtkSeedWidget returns a pointer to an int, being the
+ * handle number of the deleted point
  * - vtkCommand::ResetWindowLevelEvent
  *  - Widgets/vtkImagePlaneWidget returns an array of 2 double values (window
  * and level)
@@ -272,6 +275,7 @@
     _vtk_add_event(CreateTimerEvent)\
     _vtk_add_event(DestroyTimerEvent)\
     _vtk_add_event(PlacePointEvent)\
+    _vtk_add_event(DeletePointEvent)\
     _vtk_add_event(PlaceWidgetEvent)\
     _vtk_add_event(CursorChangedEvent)\
     _vtk_add_event(ExecuteInformationEvent)\

Interaction/Widgets/vtkSeedWidget.cxx

@@ -315,15 +315,12 @@ void vtkSeedWidget::DeleteAction(vtkAbstractWidget *w)
   vtkSeedRepresentation *rep =
     reinterpret_cast<vtkSeedRepresentation*>(self->WidgetRep);
   int removeId = rep->GetActiveHandle();
-  if ( removeId != -1 )
-  {
-    rep->RemoveActiveHandle();
-  }
-  else
-  {
-    rep->RemoveLastHandle();
-    removeId = static_cast<int>(self->Seeds->size())-1;
-  }
+  removeId =
+    removeId != -1 ? removeId : static_cast<int>(self->Seeds->size()) - 1;
+  // Invoke event for seed handle before actually deleting
+  self->InvokeEvent(vtkCommand::DeletePointEvent, &(removeId));
+
+  rep->RemoveHandle(removeId);
   self->DeleteSeed(removeId);
   // Got this event, abort processing if it
   self->EventCallbackCommand->SetAbortFlag(1);

Interaction/Widgets/vtkSeedWidget.h

@@ -59,6 +59,8 @@
  *   vtkCommand::InteractionEvent (moving after selecting something)
  *   vtkCommand::PlacePointEvent (after point is positioned;
  *                                call data includes handle id (0,1))
+ *   vtkCommand::DeletePointEvent (before point is deleted;
+ *                                call data includes handle id (0,1))
  * </pre>
  *
  * @sa