3219 creaMaracasVisu Feature New Normal - vtk8itk4wx3-mingw64

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuImageActor.cxx

diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx
index 40b3f246fecf3c9d9592807c411964badde4d7f5..fb2df56c67176eedda5687e2f11db4be6c6d8965 100644 (file)
--- a/bbtk/src/bbmaracasvisuImageActor.cxx
+++ b/bbtk/src/bbmaracasvisuImageActor.cxx
@@ -47,12 +47,18 @@ printf("EED ImageActor::Process Start\n");
                vtkRenderer *render                             = bbGetInputRenderer();
                vtkImageData *img                               = bbGetInputIn();
                vtkLinearTransform* transform   = bbGetInputTransform();
-
-               if(img != NULL)
+                               
+                               
+       if(img != NULL)
                {
                        if (bbGetInputLookupTable()==NULL)
                        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                imageactor->SetInput( img );    
+#else
+                               imageactor->SetInputData( img );        
+#endif
                        } else {
 /*
                                vtkLookupTable *table = vtkLookupTable::New();
@@ -115,9 +121,17 @@ vtkLookupTable *table = vtkLookupTable::New();
 //                             imageshiftscale->SetOutputScalarTypeToUnsignedChar();
 
 //                             color->SetInput( imageshiftscale->GetOutput() );
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                color->SetInput( img );
                                color->Update();
                                imageactor->GetMapper()->SetInput( color->GetOutput() );
+#else
+                               color->SetInputData( img );
+                               imageactor->GetMapper()->SetInputData( color->GetOutput() );
+#endif
                                imageactor->GetProperty()->SetInterpolationTypeToNearest();
                        }