#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / lib / Kernel / VTKObjects / VolumeRenderer / volumerenderermanagerdata.cxx

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
index 00d115b0bc25ab3b531f42af412fb8dd40c615e2..fcfd3c3b9763ce94658e96783e7b25d9a1bc01ae 100644 (file)
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
@@ -35,6 +35,14 @@
 
 #include <vtkVolumeRayCastMapper.h>
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+  //...
+#else
+#include <vtkGPUVolumeRayCastMapper.h>
+#endif
+
 // EED This is code for Juan Carlos Prieto TESTES
 //#if VTK_MAJOR_VERSION >= 5
 //    #if VTK_MINOR_VERSION >= 6
@@ -164,7 +172,15 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
 #endif
        VolumeMapper->SetClippingPlanes( _volumePlanes );
        _newvol->SetMapper(VolumeMapper );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        VolumeMapper->SetInput( _vol );
+#else
+       VolumeMapper->SetInputData( _vol );
+#endif
+
+
        VolumeMapper->Update();
        _newvol->Update();
 }
@@ -212,7 +228,13 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int
         BoxWidget->SetInteractor( interactor );
         BoxWidget->SetPlaceFactor(1.01);
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
         BoxWidget->SetInput( _vol );
+#else
+        BoxWidget->SetInputData( _vol );
+#endif
+
         BoxWidget->InsideOutOn();
         BoxWidget->PlaceWidget();