TemporalPicker

[bbtk.git] / packages / vtk / src / bbvtkTemporalPicker.cxx

diff --git a/packages/vtk/src/bbvtkTemporalPicker.cxx b/packages/vtk/src/bbvtkTemporalPicker.cxx
index a5af484804c25a75a32085755328035a8f7b92d3..0afbc5d7fe318878f5302c457afabe9d8b357043 100644 (file)
--- a/packages/vtk/src/bbvtkTemporalPicker.cxx
+++ b/packages/vtk/src/bbvtkTemporalPicker.cxx
@@ -1,8 +1,38 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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"
 #include "bbvtkPackage.h"
+
+#include "creaVtk_MACROS.h"
+
 namespace bbvtk
 {
 
@@ -32,40 +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]; 
-                       if ((px>=0) && (px<sizeX)  && (py>=0) && (py<sizeY) )
+                       int py=bbGetInputPoint()[1];
+//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 ( (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 );
@@ -75,14 +136,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);
 }
 //=====