removed MyHandleWidget, use vtkHandleWidget instead

Author: Tom O'Reilly

src/qt-guilib/DrawInteractorStyle.cpp

@@ -35,14 +35,6 @@
 using namespace mb_system;
 
 vtkStandardNewMacro(DrawInteractorStyle);
-vtkStandardNewMacro(MyHandleWidget);
-
-
-
-void MyHandleWidget::removeKeyObservers(vtkRenderWindowInteractor* interactor) {
-  interactor->RemoveObserver(this->KeyEventCallbackCommand);
-}
-
 
 //------------------------------------------------------------------------------
 DrawInteractorStyle::DrawInteractorStyle()
@@ -105,7 +97,6 @@ void DrawInteractorStyle::OnLeftButtonUp() {
     // Detach each widget from the Interactor before releasing memory
     for (auto &w : pinWidgets_) {
       w->EnabledOff();
-      w->removeKeyObservers(Interactor);
       w->SetInteractor(nullptr);
     }
 
@@ -120,7 +111,7 @@ void DrawInteractorStyle::OnLeftButtonUp() {
   std::copy(userPath_[pointIndex].begin(), userPath_[pointIndex].end(), point);
 
   // Put a pin marker at selected point
-  auto pinWidget = vtkSmartPointer<MyHandleWidget>::New();
+  auto pinWidget = vtkSmartPointer<vtkHandleWidget>::New();
   auto pin = vtkSmartPointer<vtkFixedSizeHandleRepresentation3D>::New();
 
   pin->SetWorldPosition(point);    // C-style double array input

src/qt-guilib/DrawInteractorStyle.h

@@ -21,18 +21,6 @@ class vtkUnsignedCharArray;
 
 namespace mb_system {
 
-  /* **
-     Need this subclass to work around a vtkHandleWidget bug which
-     results in null ptr error when 'shift' is pressed
-  ** */
-  class MyHandleWidget : public vtkHandleWidget {
-  public:
-    static MyHandleWidget* New();
-    vtkTypeMacro(MyHandleWidget, vtkHandleWidget);
-
-    void removeKeyObservers(vtkRenderWindowInteractor* interactor);
-  };
-  
   class TopoDataItem;
 
   /* **
@@ -120,7 +108,7 @@ namespace mb_system {
     /// VTK rendering functions.)
     /// As class members, the individual vector elements
     /// will not be deallocated until the vectors are cleared. 
-    std::vector<vtkSmartPointer<MyHandleWidget>> pinWidgets_;
+    std::vector<vtkSmartPointer<vtkHandleWidget>> pinWidgets_;
     std::vector<vtkSmartPointer<vtkHandleRepresentation>> pinRepresentations_;