Clean code

[creaVtk.git] / lib / creaVtk / creaVtkPlaneWidget.cpp

diff --git a/lib/creaVtk/creaVtkPlaneWidget.cpp b/lib/creaVtk/creaVtkPlaneWidget.cpp
index f770d77d865f83d2f2fdcee6bf774dccc32b942e..76af319eed93e38ad28984905625250d0e3d5413 100644 (file)
--- a/lib/creaVtk/creaVtkPlaneWidget.cpp
+++ b/lib/creaVtk/creaVtkPlaneWidget.cpp
@@ -113,13 +113,46 @@ int creaVtkPlaneWidget::GetResolution()
        return _resolution;
 }
 
+
+
+//------------------------------------------------------------------------
+std::vector<double> creaVtkPlaneWidget::GetCenter()
+{
+       std::vector<double> vecCenter;
+       double point[3];
+       _vPlaneWidget->GetCenter(point);
+       vecCenter.push_back(point[0]);
+       vecCenter.push_back(point[1]);
+       vecCenter.push_back(point[2]);
+       return vecCenter;
+}
+
+//------------------------------------------------------------------------
+std::vector<double> creaVtkPlaneWidget::GetNormal()
+{
+       std::vector<double> vecNormal;
+       double point[3];
+       _vPlaneWidget->GetNormal(point);
+       vecNormal.push_back(point[0]);
+       vecNormal.push_back(point[1]);
+       vecNormal.push_back(point[2]);
+       return vecNormal;
+}
+
+
 //------------------------------------------------------------------------
 void creaVtkPlaneWidget::Process()
 {    
-printf("EED creaVtkPlaneWidget::Process Start\n");
     if ((GetActive()==true) && (GetRenderer()!=NULL))
     { 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _vPlaneWidget->SetInput( GetImage() );
+#else
+       _vPlaneWidget->SetInputData( GetImage() );
+#endif
+
        _vPlaneWidget->SetInteractor( GetRenderer()->GetRenderWindow()->GetInteractor() );
        _vPlaneWidget->NormalToXAxisOn();
        _vPlaneWidget->NormalToZAxisOn();
@@ -137,14 +170,15 @@ printf("EED creaVtkPlaneWidget::Process Start\n");
                _vPlaneWidget->AddObserver( vtkCommand::StartInteractionEvent , creavtkcallbackplanewidget );
                _vPlaneWidget->AddObserver( vtkCommand::EnableEvent , creavtkcallbackplanewidget );
        }
-printf("EED creaVtkPlaneWidget::Process up\n");
        UpdatePlane();
     } else {
        _vPlaneWidget->Off();
     }
-printf("EED creaVtkPlaneWidget::Process End\n");
 }
 
+
+
+
 //------------------------------------------------------------------------
 void creaVtkPlaneWidget::UpdatePlane()
 {