X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkTemporalPicker.cxx;h=0afbc5d7fe318878f5302c457afabe9d8b357043;hb=84bd7e760e867fc3fdb3e0b42247522fb1630cba;hp=db9240b3e3ac126296855cfad4735d9e7db5d6df;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkTemporalPicker.cxx b/packages/vtk/src/bbvtkTemporalPicker.cxx
index db9240b..0afbc5d 100644
--- a/packages/vtk/src/bbvtkTemporalPicker.cxx
+++ b/packages/vtk/src/bbvtkTemporalPicker.cxx
@@ -30,6 +30,9 @@
 //===== 
 #include "bbvtkTemporalPicker.h"
 #include "bbvtkPackage.h"
+
+#include "creaVtk_MACROS.h"
+
 namespace bbvtk
 {
 
@@ -59,42 +62,71 @@ 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;
 		
+
 		if (bbGetInputPoint().size()>=2)
 		{
 			int px=bbGetInputPoint()[0];
 			int py=bbGetInputPoint()[1];
-			int pz=bbGetInputPoint()[2];
+//EED Eraseme			int pz=bbGetInputPoint()[2];
+
+			int minX,maxX,minY,maxY;
+			minX = px-bbGetInputSizeRegion()-1;
+			maxX = px+bbGetInputSizeRegion()-1;
+			minY = py-bbGetInputSizeRegion()-1;
+			maxY = py+bbGetInputSizeRegion()-1;
 			
-			if ((px>=0) && (px<sizeX)  && (py>=0) && (py<sizeY) )
+			if ( (minX>=0)     && 
+                 (maxX<sizeX)  && 
+				 (minY>=0)     && 
+                 (maxY<sizeY) )
 			{
 				int i,j,k;
-				int minX,maxX,minY,maxY;
-				int acum,numElem;
-				minX=px-bbGetInputSizeRegion()-1;
-				maxX=px+bbGetInputSizeRegion()-1;
-				minY=py-bbGetInputSizeRegion()-1;
-				maxY=py+bbGetInputSizeRegion()-1;
+				int numElem;
+				double acum;
+
+
+				long int index		= px+py*sizeX;
+				long int stepIndex	= sizeX*sizeY;
+				DEF_POINTER_IMAGE_VTK_CREA(vIn,ssIn,pIn,stIn,bbGetInputIn() )
+
 				for (k=0;k<sizeZ;k++)
 				{
-					acum=0;
-					numElem=0;
+					acum	= 0;
+					numElem	= 0;
+
+					GETVALUE2_VTK_CREA(vIn,pIn,stIn,index)
+					numElem++;
+					acum 	= acum  + vIn;
+					index	= index + stepIndex;
+/*
 					for(i=minX;i<=maxX;i++)
 					{ 
 						for(j=minY;j<=maxY;j++)
 						{ 
-							if ((i>=0) && (i<sizeX)  && (j>=0) && (j<sizeY) )
-							{ 
+//							if ((i>=0) && (i<sizeX)  && (j>=0) && (j<sizeY) )
+//							{ 
 								acum = acum + bbGetInputIn()->GetScalarComponentAsDouble(i, j, k, 0);
 								numElem++;
-							}// i j
+//							}// if i j
 						}// for j
 					} // for i
 					
+*/
+
+
+
 					if (numElem>0) 
 					{
 						result.push_back( acum/numElem );