#

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

diff --git a/bbtk/src/bbmaracasvisuAnimationSphere.cxx b/bbtk/src/bbmaracasvisuAnimationSphere.cxx
index e3555c2366abe9f8bd3ba8500b3c491cef6b8a45..887cd0ef0f7ed1c7312dfae79be8cbb579a7555c 100644 (file)
--- a/bbtk/src/bbmaracasvisuAnimationSphere.cxx
+++ b/bbtk/src/bbmaracasvisuAnimationSphere.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 "bbmaracasvisuAnimationSphere.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -35,7 +60,12 @@ void AnimationSphere::Process()
                        vtksphere->SetRadius( 1  ); 
 
                vtkPolyDataMapper       *sphereMapper   = vtkPolyDataMapper::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        sphereMapper->SetInput( vtksphere->GetOutput() );
+#else
+                       sphereMapper->SetInputData( vtksphere->GetOutput() );
+#endif
 
                sphereActor             = vtkActor::New();
                        sphereActor->SetMapper(sphereMapper);
@@ -119,7 +149,14 @@ void AnimationSphere::Process()
                                w2i = vtkWindowToImageFilter::New();
                                png = vtkPNGWriter::New();
                                w2i->SetInput( bbGetInputRenderer()->GetRenderWindow() );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                png->SetInput( w2i->GetOutput() );     
+#else
+                               png->SetInputData( w2i->GetOutput() );     
+#endif
+
                                png->SetFileName( newFileName.c_str() );
                                png->Write();
                                png->Delete();