X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuImageActor.cxx;h=c016625aaa4adce9f58c5b179487733cf7e057f6;hb=4b2a99534d79424c7892e09160a1488604741064;hp=40b3f246fecf3c9d9592807c411964badde4d7f5;hpb=db334f20fd9ada7539efde5952135ddfc901a2f4;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx
index 40b3f24..c016625 100644
--- a/bbtk/src/bbmaracasvisuImageActor.cxx
+++ b/bbtk/src/bbmaracasvisuImageActor.cxx
@@ -40,19 +40,22 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ImageActor)
 BBTK_BLACK_BOX_IMPLEMENTATION(ImageActor,bbtk::AtomicBlackBox);
 void ImageActor::Process()
 {
-
-printf("EED ImageActor::Process Start\n");
-
 		//JCP 04/04/09
 		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 +118,18 @@ 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 );
+ 				color->Update();
+				imageactor->GetMapper()->SetInputData( color->GetOutput() );
+#endif
 				imageactor->GetProperty()->SetInterpolationTypeToNearest();
 			}
 
@@ -131,23 +143,17 @@ vtkLookupTable *table = vtkLookupTable::New();
 			} // render
 			bbSetOutputOut(imageactor);
 		} // img
-			
-			
+				
 		// Interface Update
 		if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
 		{
 				firsttime=false;
 				bbGetInputRenderer()->AddActor( imageactor );
 		}
-		
 		imageactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
-		bbSetOutputOut(imageactor);
-
-
-printf("EED ImageActor::Process End\n");
-
-	
+		bbSetOutputOut(imageactor);	
 }
+
 void ImageActor::bbUserSetDefaultValues()
 {
     firsttime 	= true;