Feature #1648 Add a box finding a value in a list of intervals.

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

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index 5c33b54c367cfa1aaee0174ac790dd2bc3835348..2deda14b1e2856a14a06bb4298fcd581e09d02b5 100644 (file)
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:01 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2011/06/16 12:28:43 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -33,22 +33,19 @@
  *  \brief 
  */
 
-
 #ifdef _USE_VTK_
 
-
 #include "bbvtkSegmentationConnectivity.h"
 #include "bbvtkPackage.h"
 
 namespace bbvtk
 {
-
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity);
   BBTK_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity,
                                bbtk::AtomicBlackBox);
-  
-  
-       // --------------------------------------------------------------       
+
+// --------------------------------------------------------------
+
   void SegmentationConnectivity::bbUserSetDefaultValues() 
   { 
          thresh2       = NULL;
@@ -69,7 +66,8 @@ namespace bbvtk
          bbSetOutputOut(NULL);
   }
 
-       // --------------------------------------------------------------       
+// --------------------------------------------------------------
+               
        void SegmentationConnectivity::bbUserInitializeProcessing()
        {
                thresh2 = vtkImageThreshold::New();
@@ -88,8 +86,9 @@ namespace bbvtk
                        cast4->SetInput(connect2->GetOutput());
                        cast4->SetOutputScalarTypeToUnsignedShort();
        }
-       
-       // --------------------------------------------------------------       
+
+// --------------------------------------------------------------
+               
   void SegmentationConnectivity::bbUserFinalizeProcessing() 
   { 
          if (thresh2!=NULL)
@@ -111,11 +110,11 @@ namespace bbvtk
          {
                  cast4->Delete();
                  cast4=NULL;
-         }
-         
+         }  
   }
 
-       // --------------------------------------------------------------       
+// --------------------------------------------------------------
+               
   void SegmentationConnectivity::DoProcess()
   {
     vtkImageData *imagedata = bbGetInputIn();
@@ -128,17 +127,32 @@ namespace bbvtk
     thresh2->Update();
     cast2->Update();
     connect2->RemoveAllSeeds ();
-    connect2->AddSeed( bbGetInputPositionXYZ()[0] , bbGetInputPositionXYZ()[1] , bbGetInputPositionXYZ()[2] );
-    connect2->Update();
-    cast4->Update();
-    
-    bbSetOutputOut(cast4->GetOutput() );         
+         
+       int x = bbGetInputPositionXYZ()[0];
+       int y = bbGetInputPositionXYZ()[1];
+       int z = bbGetInputPositionXYZ()[2];
+
+         int ext[6];
+         imagedata->GetWholeExtent(ext);
+         int maxx = ext[1]-ext[0]+1;
+         int maxy = ext[3]-ext[2]+1;
+         int maxz = ext[5]-ext[4]+1;
+         if ( x<0 ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range x: %d -> 0 \n",x ); x=0; }
+         if ( y<0 ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range y: %d -> 0 \n",y ); y=0;}
+         if ( z<0 ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range z: %d -> 0 \n",z ); z=0;}
+
+         if ( x>=maxx ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range x: %d -> %d \n",x, maxx-1 ); x=maxx-1; }
+         if ( y>=maxy ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range y: %d -> %d \n",y, maxy-1 ); y=maxy-1; }
+         if ( z>=maxz ) {  printf("Warnnig bbtk::vtk::SegmentationConnectivity::DoProcess limites of the image out of range z: %d -> %d \n",y, maxz-1 ); z=maxz-1; }
+         
+         connect2->AddSeed( x,y,z );
+         connect2->Update();
+         cast4->Update();                      
+         bbSetOutputOut(cast4->GetOutput() );
   }
   
-
 }// EO namespace bbvtk
 
-
 #endif //_USE_VTK_