]> Creatis software - bbtk.git/blobdiff - packages/vtk/src/bbvtkSegmentationConnectivity.cxx
Clean code
[bbtk.git] / packages / vtk / src / bbvtkSegmentationConnectivity.cxx
index 679e0706aa5530eb68a30d28860d995f98e7ac86..215516ea3e47765ef6b33f8400661685f2bf48e5 100644 (file)
@@ -43,6 +43,8 @@
 #include "bbvtkSegmentationConnectivity.h"
 #include "bbvtkPackage.h"
 
+#include "bbtkStaticLecture.h"
+
 namespace bbvtk
 {
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity);
@@ -54,10 +56,9 @@ namespace bbvtk
   void SegmentationConnectivity::bbUserSetDefaultValues() 
   { 
          thresh2       = NULL;
-         cast2         = NULL;
+//       cast2         = NULL;
          connect2      = NULL;
          cast4         = NULL;
-               
          bbSetInputIn(NULL);
          std::vector<int> position;
          position.push_back(0);
@@ -66,34 +67,40 @@ namespace bbvtk
          bbSetInputPositionXYZ(position);
          std::vector<int> threshold;
          threshold.push_back(0);
-         threshold.push_back(0);
+         threshold.push_back(1);
          bbSetInputThresholdMinMax(threshold);
          bbSetOutputOut(NULL);
+         bbSetInputOutputFormat("SAME");
+         bbSetInputValue(255);
   }
 
-// --------------------------------------------------------------
-               
+// --------------------------------------------------------------      
        void SegmentationConnectivity::bbUserInitializeProcessing()
        {
                thresh2 = vtkImageThreshold::New();
-                       thresh2->SetInValue(255);
-                       thresh2->SetOutputScalarTypeToUnsignedShort();
-                       thresh2->SetOutValue(0);
-               cast2 = vtkImageCast::New();
-                       cast2->SetInput(thresh2->GetOutput());
-                       cast2->SetOutputScalarTypeToUnsignedChar();
+               thresh2->SetInValue(255);
+               thresh2->SetOutValue(0);
+               thresh2->SetOutputScalarTypeToUnsignedChar();
                connect2 = vtkImageSeedConnectivity::New();
-                       connect2->SetInput(cast2->GetOutput());
-                       connect2->SetInputConnectValue(255);
-                       connect2->SetOutputConnectedValue(255);
-                       connect2->SetOutputUnconnectedValue(0);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               connect2->SetInput(thresh2->GetOutput());
+#else
+               connect2->SetInputData(thresh2->GetOutput());
+#endif
+               connect2->SetInputConnectValue(255);
+               connect2->SetOutputConnectedValue( 255 );
+               connect2->SetOutputUnconnectedValue(0);
                cast4 = vtkImageCast::New();
-                       cast4->SetInput(connect2->GetOutput());
-                       cast4->SetOutputScalarTypeToUnsignedShort();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               cast4->SetInput(connect2->GetOutput());
+#else
+               cast4->SetInputData(connect2->GetOutput());
+#endif
        }
 
-// --------------------------------------------------------------
-               
+// --------------------------------------------------------------              
   void SegmentationConnectivity::bbUserFinalizeProcessing() 
   { 
          if (thresh2!=NULL)
@@ -101,11 +108,11 @@ namespace bbvtk
                  thresh2->Delete();
                  thresh2=NULL;
          }
-         if (cast2!=NULL)
-         {
-                 cast2->Delete();
-                 cast2=NULL;
-         }
+//       if (cast2!=NULL)
+//       {
+//               cast2->Delete();
+//               cast2=NULL;
+//       }
          if (connect2!=NULL)
          {
                  connect2->Delete();
@@ -119,45 +126,63 @@ namespace bbvtk
   }
 
 // --------------------------------------------------------------
-               
   void SegmentationConnectivity::DoProcess()
   {
-    vtkImageData *imagedata = bbGetInputIn();
-    imagedata->UpdateInformation();
-    imagedata->SetUpdateExtent(imagedata->GetWholeExtent());
-    imagedata->Update();
-    thresh2->ThresholdBetween(3000, 3001);
-    thresh2->SetInput(imagedata);
-    thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
-    thresh2->Modified();
-    thresh2->Update();
-    cast2->Modified();
-    cast2->Update();
-    connect2->RemoveAllSeeds ();
-         
-       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->Modified();
-         connect2->Update();
-         cast4->Update();                      
-         bbSetOutputOut(cast4->GetOutput() );
-  }
+       int x,y,z;
+       int i,numPoints = bbGetInputPositionXYZ().size()/3;
+       int verif = (bbGetInputPositionXYZ().size()-1) % 3;
+       if (( numPoints>=1) && (verif==2) && (bbGetInputIn()!=NULL)) 
+       {
+//EED 2020-01-18
+               int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
+//        int outputformat=4;
+               vtkImageData *imagedata = bbGetInputIn();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               imagedata->UpdateInformation();
+               imagedata->SetUpdateExtent(imagedata->GetWholeExtent());
+               imagedata->Update();
+               thresh2->SetInput(imagedata);
+#else
+//             imagedata->SetExtent(imagedata->GetExtent());
+               thresh2->SetInputData(imagedata);
+#endif
+               thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
+               thresh2->Update();
+               connect2->RemoveAllSeeds ();
+               int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               imagedata->GetWholeExtent(ext);
+#else
+               imagedata->GetExtent(ext);
+#endif
+               int maxX = ext[1]-ext[0]+1;
+               int maxY = ext[3]-ext[2]+1;
+               int maxZ = ext[5]-ext[4]+1;
+               for (i=0;i<numPoints;i++)
+               {
+                       x = bbGetInputPositionXYZ()[i*3+0];
+                       y = bbGetInputPositionXYZ()[i*3+1];
+                       z = bbGetInputPositionXYZ()[i*3+2];
+                       if ( (x>=0) || (x<maxX) || (y>=0) || (y<maxY) || (z>=0) || (z<maxZ) )
+                       {
+                               connect2->AddSeed( x,y,z );
+                       } else {
+                               printf("EED WARNNIG! In box: SegmentationConnectivity points list out of range \n");
+                       } // if point inside image 
+               } // for i
+               connect2->SetOutputConnectedValue( bbGetInputValue() );
+               cast4->SetOutputScalarType( outputformat );
+               connect2->Modified();
+               connect2->Update();
+               cast4->Update();
+    bbSetOutputOut(cast4->GetOutput() );
+       }  else {
+               printf("EED WARNNIG! In box: SegmentationConnectivity List of points are not coherent. \n");
+               bbSetOutputOut( NULL );
+       }// if numPoints verif
+}
   
 }// EO namespace bbvtk