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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
index ab2219e..4e981c4 100755
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
@@ -70,7 +70,14 @@ void ImageUndoRedo::Redo( )
 void ImageUndoRedo::SetImage( VTKImageDataPointerType image )
 {
 	this->m_CurrentImage = image;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	this->m_CurrentImage->Update( );
+#else
+	// ..
+#endif
+
 	this->UpdateUndoImage( );
 }
 // ----------------------------------------------------------------------------------
@@ -97,10 +104,20 @@ void ImageUndoRedo::SetURImages( ImageMManagerType* imMManager )
 // ----------------------------------------------------------------------------------
 void ImageUndoRedo::UpdateUndoImage( )
 {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	this->m_CurrentImage->Update( );
+#else
+	// ...
+#endif
 	this->m_UndoImage = VTKImageDataPointerType::New( );
 	this->m_UndoImage->DeepCopy( m_CurrentImage );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	this->m_UndoImage->Update( );
+#else
+	// ..
+#endif
 }
 // ----------------------------------------------------------------------------------
 ImageUndoRedo::VTKImageDataPointerType ImageUndoRedo::GetImageRegion(
@@ -110,9 +127,21 @@ ImageUndoRedo::VTKImageDataPointerType ImageUndoRedo::GetImageRegion(
 	extract->SetVOI( region.minX, region.maxX, region.minY, region.maxY,
 		region.minZ, region.maxZ );
 	extract->SetSampleRate( 1, 1, 1 );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	extract->SetInput( img );
+#else
+	extract->SetInputData( img );
+#endif
 	VTKImageDataPointerType imgResult = extract->GetOutput( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	imgResult->Update( );
+#else
+	// ..
+#endif
+
 	return ( imgResult );
 }
 // ----------------------------------------------------------------------------------