X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaVtkBasicSlicer.cxx;h=9a9611653f1857d8ca3cb6d08ef22fbb57a4c35c;hb=2fc556b7d79550167e650d6d026e3201e6731704;hp=3410a693485f876683a94a0368ebf4b77e655dc8;hpb=17824854619941a12697fea8524f4218f9a14ef9;p=crea.git

diff --git a/src/creaVtkBasicSlicer.cxx b/src/creaVtkBasicSlicer.cxx
index 3410a69..9a96116 100644
--- a/src/creaVtkBasicSlicer.cxx
+++ b/src/creaVtkBasicSlicer.cxx
@@ -4,6 +4,8 @@
 # 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, 
@@ -20,7 +22,8 @@
 #
 #  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.
-# ------------------------------------------------------------------------ */                                                                         
+# ------------------------------------------------------------------------ 
+*/                                                                         
 
 #ifdef USE_VTK
 
@@ -59,7 +62,14 @@ namespace crea
   // An outline is shown for context.
   
   vtkOutlineFilter* outline = vtkOutlineFilter::New();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
   outline->SetInput(I);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+  outline->SetInputData(I);
+#endif
   
   vtkPolyDataMapper* outlineMapper = vtkPolyDataMapper::New();
   outlineMapper->SetInputConnection(outline->GetOutputPort());
@@ -76,7 +86,15 @@ namespace crea
   // The 3 image plane widgets are used to probe the dataset.
   vtkImagePlaneWidget* planeWidgetX = vtkImagePlaneWidget::New();
   planeWidgetX->DisplayTextOn();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
   planeWidgetX->SetInput(I);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+  planeWidgetX->SetInputData(I);
+#endif
+
   planeWidgetX->SetPlaneOrientationToXAxes();
   planeWidgetX->SetSlicePosition((xMax+xMin)/2.);
   planeWidgetX->SetPicker(picker);
@@ -86,7 +104,15 @@ namespace crea
 
   vtkImagePlaneWidget* planeWidgetY = vtkImagePlaneWidget::New();
   planeWidgetY->DisplayTextOn();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
   planeWidgetY->SetInput(I);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+  planeWidgetY->SetInputData(I);
+#endif
+
   planeWidgetY->SetPlaneOrientationToYAxes();
   planeWidgetY->SetSlicePosition((yMax+yMin)/2.);
   planeWidgetY->SetPicker(picker);
@@ -100,7 +126,16 @@ namespace crea
   // cross-hair cursor snapping to pixel centers
   vtkImagePlaneWidget* planeWidgetZ = vtkImagePlaneWidget::New();
   planeWidgetZ->DisplayTextOn();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
   planeWidgetZ->SetInput(I);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+  planeWidgetZ->SetInputData(I);
+#endif
+
+
   planeWidgetZ->SetPlaneOrientationToZAxes();
   planeWidgetZ->SetSlicePosition((zMax+zMin)/2.);
   planeWidgetZ->SetPicker(picker);