X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkTemporalPicker.cxx;h=de512515dfbc60118cdce2a615695cc02dab4e0b;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;hp=a5af484804c25a75a32085755328035a8f7b92d3;hpb=5421fa5cb36954edfe43b9cd542d367d98ce8946;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkTemporalPicker.cxx b/packages/vtk/src/bbvtkTemporalPicker.cxx
index a5af484..de51251 100644
--- a/packages/vtk/src/bbvtkTemporalPicker.cxx
+++ b/packages/vtk/src/bbvtkTemporalPicker.cxx
@@ -1,4 +1,31 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 #include "bbvtkTemporalPicker.h"
@@ -32,7 +59,14 @@ void TemporalPicker::Process()
 	{
 		int ext[6];
 		int sizeX,sizeY,sizeZ;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		bbGetInputIn()->GetWholeExtent(ext);
+#else
+		bbGetInputIn()->GetExtent(ext);
+#endif
+
 		sizeX=ext[1]-ext[0]+1;
 		sizeY=ext[3]-ext[2]+1;
 		sizeZ=ext[5]-ext[4]+1;
@@ -40,7 +74,9 @@ void TemporalPicker::Process()
 		if (bbGetInputPoint().size()>=2)
 		{
 			int px=bbGetInputPoint()[0];
-			int py=bbGetInputPoint()[1]; 
+			int py=bbGetInputPoint()[1];
+			int pz=bbGetInputPoint()[2];
+			
 			if ((px>=0) && (px<sizeX)  && (py>=0) && (py<sizeY) )
 			{
 				int i,j,k;
@@ -75,14 +111,13 @@ void TemporalPicker::Process()
 					
 				} // for k
 			} // px py
-			
 		} else {// bbGetInputPoint
 			printf("ERROR:  Input:Point is not good defined in TemporalPicker Box..\n ");
 		} // bbGetInputPoint
 	} else {// bbGetInputIn
 		printf("ERROR:  Missing Input:In vtkImageData* in TemporalPicker Box..\n ");
 	} // bbGetInputIn
-		
+
 	bbSetOutputOut(result);
 }
 //=====