#3352 BBTK Feature New Normal - box TemporaryPicker in 3D

diff --git a/packages/vtk/src/bbvtkTemporalPicker.cxx b/packages/vtk/src/bbvtkTemporalPicker.cxx
index 37901c76fdb72462b7f354dd2361d22c60108a90..f1375acd4f72035fa4e944820350313708cbe377 100644 (file)
--- a/packages/vtk/src/bbvtkTemporalPicker.cxx
+++ b/packages/vtk/src/bbvtkTemporalPicker.cxx
@@ -41,21 +41,109 @@ BBTK_BLACK_BOX_IMPLEMENTATION(TemporalPicker,bbtk::AtomicBlackBox);
 //===== 
 // 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)
 //===== 
-void TemporalPicker::Process()
+
+
+void TemporalPicker::Process_TemporaryPicker3DT()
 {
+       std::vector<double> result;
+       if (bbGetInputInLst().size()>0)
+       {
+               int ext[6];
+               int sizeX,sizeY,sizeZ,sizeT=bbGetInputInLst().size();
 
-// THE MAIN PROCESSING METHOD BODY
-//   Here we simply set the input 'In' value to the output 'Out'
-//   And print out the output value
-// INPUT/OUTPUT ACCESSORS ARE OF THE FORM :
-//    void bbSet{Input|Output}NAME(const TYPE&)
-//    const TYPE& bbGet{Input|Output}NAME() const 
-//    Where :
-//    * NAME is the name of the input/output
-//      (the one provided in the attribute 'name' of the tag 'input')
-//    * TYPE is the C++ type of the input/output
-//      (the one provided in the attribute 'type' of the tag 'input')
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               bbGetInputInLst()[0]->GetWholeExtent(ext);
+#else
+               bbGetInputInLst()[0]->GetExtent(ext);
+#endif
+
+               sizeX = ext[1]-ext[0]+1;
+               sizeY = ext[3]-ext[2]+1;
+               sizeZ = ext[5]-ext[4]+1;
+
+               if (bbGetInputPoint().size()>=3)
+               {
+                       int px   = bbGetInputPoint()[0];
+                       int py   = bbGetInputPoint()[1];
+                       int pz   = bbGetInputPoint()[2];
+                       int minX = px-bbGetInputSizeRegion()-1;
+                       int maxX = px+bbGetInputSizeRegion()-1;
+                       int minY = py-bbGetInputSizeRegion()-1;
+                       int maxY = py+bbGetInputSizeRegion()-1;
+                       int minZ = pz-bbGetInputSizeRegion()-1;
+                       int maxZ = pz+bbGetInputSizeRegion()-1;
+                       
+                       if ( (minX>=0)     && 
+                 (maxX<sizeX)  && 
+                                (minY>=0)     && 
+                 (maxY<sizeY)  && 
+                                (minZ>=0)     && 
+                 (maxZ<sizeZ) )
+                       {
+                               int             i,j,k,t;
+                               int             numElem;
+                               double          acum;
+                               long int        index           = px + py*sizeX + pz*sizeX*sizeY;
+
+                               DEF_POINTER_IMAGE_VTK_CREA(vIn,ssIn,pIn,stIn,bbGetInputInLst()[0] )
+
+                               for (t=0;t<sizeT;t++)
+                               {
+                                       pIn=(char*)( bbGetInputInLst()[t]->GetScalarPointer() );
+                                       acum    = 0;
+                                       numElem = 0;
+
+                                       GETVALUE2_VTK_CREA(vIn,pIn,stIn,index)
+                                       numElem++;
+                                       acum    = acum  + vIn;
+/*
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  3D      calcule missing ...........\n");
+*/
 
+/*
+                                       for(i=minX;i<=maxX;i++)
+                                       { 
+                                               for(j=minY;j<=maxY;j++)
+                                               { 
+//                                                     if ((i>=0) && (i<sizeX)  && (j>=0) && (j<sizeY) )
+//                                                     { 
+                                                               acum = acum + bbGetInputIn()->GetScalarComponentAsDouble(i, j, k, 0);
+                                                               numElem++;
+//                                                     }// if i j
+                                               }// for j
+                                       } // for i
+                                       
+*/
+                                       if (numElem>0) 
+                                       {
+                                               result.push_back( acum/numElem );  /// ????????????  Aqui ????
+                                       } else {
+                                               result.push_back( 0 );
+                                       } // numElem
+                                       
+                               } // 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);
+}
+
+
+//--------------------------------------------------------------------------------------------
+void TemporalPicker::Process_TemporaryPicker2DT()
+{
        std::vector<double> result;
        if (bbGetInputIn()!=NULL)
        {
@@ -91,7 +179,7 @@ void TemporalPicker::Process()
                                 (minY>=0)     && 
                  (maxY<sizeY) )
                        {
-                               int i,j,k;
+                               int i,j,t;
                                int numElem;
                                double acum;
 
@@ -99,7 +187,7 @@ void TemporalPicker::Process()
                                long int stepIndex      = sizeX*sizeY;
                                DEF_POINTER_IMAGE_VTK_CREA(vIn,ssIn,pIn,stIn,bbGetInputIn() )
 
-                               for (k=0;k<sizeZ;k++)
+                               for (t=0;t<sizeZ;t++)
                                {
                                        acum    = 0;
                                        numElem = 0;
@@ -108,6 +196,17 @@ void TemporalPicker::Process()
                                        numElem++;
                                        acum    = acum  + vIn;
                                        index   = index + stepIndex;
+/*
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+printf("EED Warnning !!!!!!  TemporalPicker::Process Clean this method    region  ....2D......  calcule missing ...........\n");
+*/
 /*
                                        for(i=minX;i<=maxX;i++)
                                        { 
@@ -124,7 +223,7 @@ void TemporalPicker::Process()
 */
                                        if (numElem>0) 
                                        {
-                                               result.push_back( acum/numElem );
+                                               result.push_back( acum/numElem );   /// Aqui ?????
                                        } else {
                                                result.push_back( 0 );
                                        } // numElem
@@ -139,6 +238,31 @@ void TemporalPicker::Process()
        } // bbGetInputIn
        bbSetOutputOut(result);
 }
+
+void TemporalPicker::Process()
+{
+
+// THE MAIN PROCESSING METHOD BODY
+//   Here we simply set the input 'In' value to the output 'Out'
+//   And print out the output value
+// INPUT/OUTPUT ACCESSORS ARE OF THE FORM :
+//    void bbSet{Input|Output}NAME(const TYPE&)
+//    const TYPE& bbGet{Input|Output}NAME() const 
+//    Where :
+//    * NAME is the name of the input/output
+//      (the one provided in the attribute 'name' of the tag 'input')
+//    * TYPE is the C++ type of the input/output
+//      (the one provided in the attribute 'type' of the tag 'input')
+
+
+       if (bbGetInputInLst().size()>0) 
+       {
+               Process_TemporaryPicker3DT();
+       } else {
+               Process_TemporaryPicker2DT();
+       }
+
+}
 //===== 
 // 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)
 //===== 

diff --git a/packages/vtk/src/bbvtkTemporalPicker.h b/packages/vtk/src/bbvtkTemporalPicker.h
index 13b918f94e193e5dd3e5e3e482ef51375ff3dbda..84f18f01da241f2863a5512c0d5deeb5a0df9b45 100644 (file)
--- a/packages/vtk/src/bbvtkTemporalPicker.h
+++ b/packages/vtk/src/bbvtkTemporalPicker.h
@@ -40,11 +40,16 @@ class bbvtk_EXPORT TemporalPicker : public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(TemporalPicker,bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,vtkImageData*);
+    BBTK_DECLARE_INPUT(InLst,std::vector < vtkImageData*> );
     BBTK_DECLARE_INPUT(SizeRegion,int);
     BBTK_DECLARE_INPUT(Point,std::vector<int>);
        BBTK_DECLARE_OUTPUT(Out,std::vector<double>);
   BBTK_PROCESS(Process);
-  void Process();
+
+       void Process();
+       void Process_TemporaryPicker2DT();
+       void Process_TemporaryPicker3DT();
+
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(TemporalPicker,bbtk::AtomicBlackBox);
@@ -52,7 +57,8 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(TemporalPicker,bbtk::AtomicBlackBox);
        BBTK_AUTHOR("Info-Dev");
        BBTK_DESCRIPTION("Pick vector in Z direction  (2D+t => 3D)");
        BBTK_CATEGORY("");
-       BBTK_INPUT(TemporalPicker,In,"Input image",vtkImageData*,"");
+       BBTK_INPUT(TemporalPicker,In,"In image or InLst images",vtkImageData*,"");
+       BBTK_INPUT(TemporalPicker,InLst,"In image or InLst images",std::vector<vtkImageData*>,"");
        BBTK_INPUT(TemporalPicker,SizeRegion,"Size region (default 1)",int,"");
        BBTK_INPUT(TemporalPicker,Point,"Point [x,y]",std::vector<int>,"");
        BBTK_OUTPUT(TemporalPicker,Out,"Output vector with Z information",std::vector<double>,"");