X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FCheckBoard.cpp;h=08fa729fab2323686e69d07fb9d54ffe9969b048;hb=refs%2Fheads%2Fvtk7itk4;hp=f47c94c180672e44fe78dfb108c8822fc97a8540;hpb=73f77fd5de4f2a23dc595e8e7017dd9b586dddcc;p=creaRigidRegistration.git

diff --git a/lib/CheckBoard.cpp b/lib/CheckBoard.cpp
index f47c94c..08fa729 100644
--- a/lib/CheckBoard.cpp
+++ b/lib/CheckBoard.cpp
@@ -104,31 +104,64 @@ void CheckBoard::calculateImage()
 		result = vtkImageData::New();
 		if(numPixelsImg1<numPixelsImg2)
 		{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			resample->SetInput(image1);
+#else
+			resample->SetInputData(image1);
+#endif
 			factorX = (double)extImg2[1]/extImg1[1];
 			factorY = (double)extImg2[3]/extImg1[3];
 			resample->SetAxisMagnificationFactor(0,factorX);
 			resample->SetAxisMagnificationFactor(1,factorY);
 			resample->SetInformationInput(image2);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+			resample->Update();
+#else
+			// ..
+#endif
 
 			initialize(dimImg2, spcImg2);
 			result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			result->Update();
+#else
+			// ..
+#endif
+
 			createImage(result,image2,dimImg2[0],dimImg2[1]);		
 		} //if
 		else if (numPixelsImg1>numPixelsImg2)
 		{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			resample->SetInput(image2);
+#else
+			resample->SetInputData(image2);
+#endif
 			factorX = (double)extImg1[1]/extImg2[1];
 			factorY = (double)extImg1[3]/extImg2[3];
 			resample->SetAxisMagnificationFactor(0,factorX);
 			resample->SetAxisMagnificationFactor(1,factorY);
 			resample->SetInformationInput(image1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+			// ..
+#else
+			resample->Update();
+#endif
 
 			initialize(dimImg1, spcImg1);
 			result = resample->GetOutput();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			result->Update();
+#else
+			// ..
+#endif
 
 			createImage(image1,result,dimImg1[0],dimImg1[1]);
 		} // else if
@@ -136,17 +169,33 @@ void CheckBoard::calculateImage()
 		{
 			//If both images have the same number of pixels, the resultant image will have the 
 			//properties of the first image.
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			resample->SetInput(image2);
+#else
+			resample->SetInputData(image2);
+#endif
 			factorX = (double)extImg1[1]/extImg2[1];
 			factorY = (double)extImg1[3]/extImg2[3];
 			resample->SetAxisMagnificationFactor(0,factorX);
 			resample->SetAxisMagnificationFactor(1,factorY);
 			resample->SetInformationInput(image1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+			// ..
+#else
+			resample->Update();
+#endif
 
 			initialize(dimImg1, spcImg1);
 
 			result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			result->Update();
+#else
+  //...
+#endif
 
 			createImage(image1,result,dimImg1[0],dimImg1[1]);
 
@@ -165,11 +214,18 @@ void CheckBoard::initialize(int dimensions[], double spacing[])
 			newImage->Delete();
 	}
 	newImage = vtkImageData::New();
-	newImage->SetScalarType(type);
 	newImage->SetSpacing(spacing);
 	newImage->SetDimensions(dimensions);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	newImage->SetScalarType(type);
 	newImage->AllocateScalars();
 	newImage->Update();
+#else
+	newImage->AllocateScalars(type,1);
+#endif
+
 }
 
 //------------------------------------------------------------
@@ -279,7 +335,13 @@ void CheckBoard::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX,
 	}
 
 	//std::cout << "The image has been checkboardized!" << std::endl;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    newImage->Update();
+#else
+   newImage->Modified();
+#endif
+
 //   newImage->Modified();
 }
 /**Template used for the different image types