#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

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

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index 218c9db239d416b70a09501db280729f65a5106d..a04f6bdc11655b7a6948ef72cc4588766dc9ed95 100644 (file)
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -84,15 +84,27 @@ namespace bbvtk
        {
 
                thresh2 = vtkImageThreshold::New();
-                       thresh2->SetInValue(255);
-                       thresh2->SetOutputScalarTypeToUnsignedChar();
+               thresh2->SetInValue(255);
+               thresh2->SetOutputScalarTypeToUnsignedChar();
                connect2 = vtkImageSeedConnectivity::New();
-                       connect2->SetInput(thresh2->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());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               cast4->SetInput(connect2->GetOutput());
+#else
+               cast4->SetInputData(connect2->GetOutput());
+#endif
 
 // EED 2016 06 15
 
@@ -149,50 +161,70 @@ namespace bbvtk
                
   void SegmentationConnectivity::DoProcess()
   {
-       int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
-
-
-
-    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();
-// EED 2016 06 15
-//    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->SetOutputConnectedValue( bbGetInputValue() );
-         cast4->SetOutputScalarType( outputformat );
-
-         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)) 
+       {
+               int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
+               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(3000, 3001);
+               thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
+               thresh2->Modified();
+               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 point 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