X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FimageUndoRedo%2FimageInfoUR.cxx;h=3e39e532942506600d6d26e3760dddad875f0881;hb=cec46a1f16ce39a52292b54a187af0ce2004aab5;hp=1945d318318644aafea2def163daea17ef27ff67;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
index 1945d31..3e39e53 100755
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
@@ -91,13 +91,30 @@ void ImageInfoUR::LoadImagesToMemory(const StringType& gPath) {
 			VTKMetaImageReaderPointerType::New();
 	readerUndo->SetFileName(undoImagePath.c_str());
 	this->m_UndoImage = readerUndo->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	this->m_UndoImage->Update();
+#else
+	// ..
+#endif
 	//Loading Redo Image
 	VTKMetaImageReaderPointerType readerRedo =
 			VTKMetaImageReaderPointerType::New();
 	readerRedo->SetFileName(redoImagePath.c_str());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	// ..
+#else
+	readerRedo->Update();
+#endif
+
 	this->m_RedoImage = readerRedo->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	this->m_RedoImage->Update();
+#else
+	// ...
+#endif
 	//Updating status
 	this->m_OnMemory = true;
 }
@@ -135,7 +152,12 @@ void ImageInfoUR::RemoveImagesFromDisk(const StringType& gPath) {
 void ImageInfoUR::SaveImageAsMHD(const StringType& filename,
 		VTKImageDataPointerType image) {
 	VTKMetaImageWriterPointerType w = VTKMetaImageWriterPointerType::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	w->SetInput(image);
+#else
+	w->SetInputData(image);
+#endif
 	w->SetCompression(false);
 	w->SetFileDimensionality(image->GetDataDimension());
 	w->SetFileName(filename.c_str());