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=a906c7009b5c3c2ef5263f4d84ba13be7d4549ff;hp=9364d7356c8bda98e47accb3f025fd91913ac551;hpb=a55972486c881d811de6c5d2b68f5d1b2885ac11;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 9364d73..3e39e53 100755
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 /*!
  * @file	imageInfoUR.cxx
  * @brief	This file contains the implementation of the ImageInfoUR class.
@@ -66,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;
 }
@@ -110,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());