X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuImageActor.cxx;h=d640d8d2a30877d44af57e4d128ffc9a55c6e0ea;hb=56eb704bce4e7a4206ffa16c84f3000b8b8f93eb;hp=f95af03aa17cadf31ee64cceec722a46dcd10d8e;hpb=91a98a871f86ac13d5899661298b7badbfb442ad;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx
index f95af03..d640d8d 100644
--- a/bbtk/src/bbmaracasvisuImageActor.cxx
+++ b/bbtk/src/bbmaracasvisuImageActor.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuImageActor.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -17,11 +42,22 @@ void ImageActor::Process()
 		vtkLinearTransform* transform	= bbGetInputTransform();
 
 		if(img != NULL){
-			imageactor = vtkImageActor::New();
-			vtkImageShiftScale *imageshiftscale = vtkImageShiftScale::New();
+			
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			imageshiftscale->SetInput( img );	
+#else
+			imageshiftscale->SetInputData( img );	
+#endif
 			imageshiftscale->SetOutputScalarTypeToUnsignedChar();	
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			imageactor->SetInput( imageshiftscale->GetOutput() );	
+#else
+			imageshiftscale->Update();
+			imageactor->SetInputData( imageshiftscale->GetOutput() );	
+#endif
 			if (transform!=NULL){
 			  imageactor->SetUserTransform( transform );	
 			} // transform
@@ -57,6 +93,8 @@ void ImageActor::bbUserSetDefaultValues()
 	//-----------------------------------------------------------------	
 	void ImageActor::bbUserInitializeProcessing()
 	{
+		imageactor = vtkImageActor::New();
+		imageshiftscale = vtkImageShiftScale::New();
 	}
 	
 	//-----------------------------------------------------------------