X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FTransparency.cxx;h=874968555fb68b43109df524653f919f25abfe5c;hb=d43c8fa374c578decfdcf355ec6dca7cb7216de8;hp=15d46fe2abcec7cf42ee27b4736c02f139d9387c;hpb=73f77fd5de4f2a23dc595e8e7017dd9b586dddcc;p=creaRigidRegistration.git

diff --git a/lib/Transparency.cxx b/lib/Transparency.cxx
index 15d46fe..8749685 100644
--- a/lib/Transparency.cxx
+++ b/lib/Transparency.cxx
@@ -88,7 +88,12 @@ void Transparency::calculateImage()
 		vtkImageData *result;
 		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);
@@ -96,14 +101,31 @@ void Transparency::calculateImage()
 			resample->SetInformationInput(_image2);
 
 			initialize(dimImg2, spcImg2);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+			//..
+#else
+			resample->Update();
+#endif
+
 			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);
@@ -111,9 +133,21 @@ void Transparency::calculateImage()
 			resample->SetInformationInput(_image1);
 
 			initialize(dimImg1, spcImg1);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+			// ...
+#else
+			resample->Update();
+#endif
 			result = resample->GetOutput();
 			
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			result->Update();
+#else
+			result->Modified();
+#endif
 
 			createImage(_image1,result,dimImg1[0],dimImg1[1]);
 		} // else if
@@ -121,17 +155,33 @@ void Transparency::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);
-
 			initialize(dimImg1, spcImg1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+			// ...
+#else
+			resample->Update();
+#endif
 
 			result = resample->GetOutput();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			result->Update();
+#else
+			result->Modified();
+#endif
 			
 			createImage(_image1,result,dimImg1[0],dimImg1[1]);
 
@@ -146,11 +196,17 @@ void Transparency::initialize(int dimensions[], double spacing[])
 {
 	// Setting the new image
 	_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
+
 
 }
 
@@ -258,7 +314,14 @@ void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX
 		createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
 	}
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_newImage->Update();
+#else
+	_newImage->Modified();
+#endif
+
+
 }
 
 template <class T>