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

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

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx
index 27c4d2be6e4173fbafcaa0fbe3a8f6a67d3bd591..4931d51876ba5d43680e40b94595a25280a1e477 100644 (file)
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx
@@ -111,12 +111,26 @@ int VolumeRendererManager::addVolume(vtkImageData* img, vtkRenderWindowInteracto
 
 
         vtkSmartPointer< vtkImageLuminance > luminance = vtkSmartPointer< vtkImageLuminance >::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
         luminance->SetInput(img);
+#else
+        luminance->SetInputData(img);
+#endif
+
         luminance->Update();
 
         vtkSmartPointer< vtkImageAppendComponents > append = vtkSmartPointer< vtkImageAppendComponents >::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
         append->SetInput(0, img);
         append->SetInput(1, luminance->GetOutput());
+#else
+        append->SetInputData(0, img);
+        append->SetInputData(1, luminance->GetOutput());
+#endif
+
         append->Update();
 
 
@@ -301,12 +315,19 @@ void VolumeRendererManager::GetImages(vtkImageData* img, vector<vtkImageData* >&
 
     for(unsigned i = 0; i < img->GetNumberOfScalarComponents(); i++){
         vectimg.push_back(vtkImageData::New());
-        vectimg[i]->SetNumberOfScalarComponents(1);
         vectimg[i]->SetExtent(img->GetExtent());
         vectimg[i]->SetSpacing(img->GetSpacing());
         vectimg[i]->SetOrigin(img->GetOrigin());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+        vectimg[i]->SetNumberOfScalarComponents(1);
         vectimg[i]->SetScalarType(img->GetScalarType());
         vectimg[i]->AllocateScalars();
+#else
+        vectimg[i]->AllocateScalars(img->GetScalarType(),1);
+#endif
+
     }
 
     int *extent = img->GetExtent();
@@ -446,7 +467,13 @@ vtkImageData* VolumeRendererManager::getImageData(std::string filename){
                 vtkImageData* img = reader->GetOutput();
 
                 vtkImageCast* cast = vtkImageCast::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                 cast->SetInput(img);
+#else
+                cast->SetInputData(img);
+#endif
+
                 cast->SetOutputScalarTypeToUnsignedShort();
                 cast->Update();
                 //reader->Delete();