ENH: Markups: Add RemovePointFromNthMarkup function

git-svn-id: http://svn.slicer.org/Slicer4/trunk@27947 3bd1e089-480b-0410-8dfb-8563597acbee

Author: jcfr

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.cxx

@@ -553,6 +553,24 @@ int vtkMRMLMarkupsNode::AddPointToNthMarkup(vtkVector3d point, int n)
   return pointIndex;
 }
 
+//-----------------------------------------------------------
+bool vtkMRMLMarkupsNode::RemovePointFromNthMarkup(int pointIndex, int n)
+{
+  if (!this->MarkupExists(n))
+    {
+    return false;
+    }
+  if (pointIndex < 0 || pointIndex >= static_cast<int>(this->Markups[n].points.size()))
+    {
+    return false;
+    }
+  this->Markups[n].points.erase(this->Markups[n].points.begin() + pointIndex);
+  int markupIndex = n;
+  this->InvokeCustomModifiedEvent(
+    vtkMRMLMarkupsNode::NthMarkupModifiedEvent, (void*)&markupIndex);
+  return true;
+}
+
 //-----------------------------------------------------------
 vtkVector3d vtkMRMLMarkupsNode::GetMarkupPointVector(int markupIndex, int pointIndex)
 {

Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.h

@@ -193,6 +193,8 @@ class  VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsNode : public vtkMRML
   int AddPointWorldToNewMarkup(vtkVector3d point, std::string label = std::string());
   /// Add a point to the nth markup, returning the point index, -1 on failure.
   int AddPointToNthMarkup(vtkVector3d point, int n);
+  /// Remove a point from nth markup, returning true on success.
+  bool RemovePointFromNthMarkup(int pointIndex, int n);
 
   /// Get the position of the pointIndex'th point in markupIndex markup,
   /// returning it as a vtkVector3d

Modules/Loadable/Markups/Testing/Cxx/vtkMRMLMarkupsNodeTest1.cxx

@@ -221,10 +221,10 @@ int vtkMRMLMarkupsNodeTest1(int , char * [] )
   // now add some markups
   //
   std::cout << "Adding markups with points" << std::endl;
-  node1->AddMarkupWithNPoints(1);
-  node1->AddMarkupWithNPoints(2);
-  node1->AddMarkupWithNPoints(3);
-  node1->AddMarkupWithNPoints(6);
+  node1->AddMarkupWithNPoints(1); // markupIndex 0
+  node1->AddMarkupWithNPoints(2); // markupIndex 1
+  node1->AddMarkupWithNPoints(3); // markupIndex 2
+  node1->AddMarkupWithNPoints(6); // markupIndex 3
 
   numMarkups = node1->GetNumberOfMarkups();
   if (numMarkups != 4)
@@ -548,5 +548,37 @@ int vtkMRMLMarkupsNodeTest1(int , char * [] )
     return EXIT_FAILURE;
     }
 
+  // Test RemovePointFromNthMarkup
+  std::cout << "Test RemovePointFromNthMarkup" << std::endl;
+  int markupIndex = 2;
+
+  {
+    double point0[3] = {0.0, 0.1, 0.2};
+    node1->SetMarkupPointFromArray(markupIndex, 0, point0);
+    double point1[3] = {1.0, 1.1, 1.2};
+    node1->SetMarkupPointFromArray(markupIndex, 1, point1);
+    double point2[3] = {2.0, 2.1, 2.2};
+    node1->SetMarkupPointFromArray(markupIndex, 2, point2);
+
+    CHECK_INT(node1->GetNumberOfPointsInNthMarkup(markupIndex), 3);
+  }
+
+  node1->RemovePointFromNthMarkup(1, markupIndex);
+  CHECK_INT(node1->GetNumberOfPointsInNthMarkup(markupIndex), 2);
+
+  {
+    double point0[3] = {0., 0., 0.};
+    node1->GetMarkupPoint(markupIndex, 0, point0);
+    CHECK_DOUBLE(point0[0], 0.0);
+    CHECK_DOUBLE(point0[1], 0.1);
+    CHECK_DOUBLE(point0[2], 0.2);
+
+    double point1[3] = {0., 0., 0.};
+    node1->GetMarkupPoint(markupIndex, 1, point1);
+    CHECK_DOUBLE(point1[0], 2.0);
+    CHECK_DOUBLE(point1[1], 2.1);
+    CHECK_DOUBLE(point1[2], 2.2);
+  }
+
   return EXIT_SUCCESS;
 }