3472 TDx

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtkClipping3DView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
index 84c3c609dd20fdad9e612e648d49aed7ff9dd065..a9a493a503a931f3d7516e48a3715fd2d052655a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
@@ -23,6 +23,13 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
+
 #include "wxVtkClipping3DView.h"
 
 #include "wxVtkClipping3DViewCntrlPanel.h"
@@ -168,19 +175,21 @@ void wxVtkClipping3DView::Configure()
        _wxvtk3Dbaseview->Configure();
 
        // Actors are added to the renderer.
-       _wxvtk3Dbaseview->GetRenderer()->AddActor( _vtkclipping3Ddataviewer->GetOutlineActor() );
 
        _boxWidgetS1 = vtkBoxWidget::New();
        _boxWidgetS1->SetInteractor( _wxvtk3Dbaseview->GetWxVTKRenderWindowInteractor() );
        _boxWidgetS1->SetPlaceFactor(1.25);
 
-
-
        vtkStripper *stripper=_vtkclipping3Ddataviewer->GetTissueStripper(0);
        vtkPolyData *polydata= stripper->GetOutput();
 
-
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _boxWidgetS1->SetInput( polydata );
+#else
+       stripper->Update();
+       _boxWidgetS1->SetInputData( polydata );
+#endif
 
 //EED 2016-08-19       
        //_boxWidgetS1->PlaceWidget();
@@ -218,7 +227,14 @@ void wxVtkClipping3DView::Configure()
        _boxWidgetVolume = vtkBoxWidget::New();
        _boxWidgetVolume->SetInteractor( _wxvtk3Dbaseview->GetWxVTKRenderWindowInteractor() );
        _boxWidgetVolume->SetPlaceFactor(1.25);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _boxWidgetVolume->SetInput( this->GetVtkClipping3DDataViewer()->GetVtkMPRBaseData()->GetImageData() );
+#else
+       _boxWidgetVolume->SetInputData( this->GetVtkClipping3DDataViewer()->GetVtkMPRBaseData()->GetImageData() );
+#endif
+
        _boxWidgetVolume->PlaceWidget();
        _boxWidgetVolume->AddObserver( vtkCommand::InteractionEvent, _vtkclipping3Ddataviewer->GetObserverV() );
        _boxWidgetVolume->HandlesOn ();
@@ -255,6 +271,7 @@ void wxVtkClipping3DView::Configure()
        _vtkclipping3Ddataviewer->SetRenderer(this->GetWxvtk3Dbaseview()->GetRenderer());
        _vtkclipping3Ddataviewer->SetInteractor(this->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor());
 }
+
 //-------------------------------------------------------------------
 void wxVtkClipping3DView::SetVtkClipping3DDataViewer(vtkClipping3DDataViewer *vtkclipping3Ddataviewer)
 {