X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSegmentationConnectivity.cxx;h=a04f6bdc11655b7a6948ef72cc4588766dc9ed95;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;hp=3b28389b314c7ba907561d6707610220205a9f43;hpb=088ed2b7bdbe14eb85a7245afaa693ddb7a53a97;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index 3b28389..a04f6bd 100644
--- 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
 
@@ -157,18 +169,32 @@ namespace bbvtk
 	{
 		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->ThresholdBetween(3000, 3001);
 		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;