#3144 creaMaracasVisu Bug New Normal - changeWx28to30

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / imageUndoRedo / imageInfoUR.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
index 1945d318318644aafea2def163daea17ef27ff67..3e39e532942506600d6d26e3760dddad875f0881 100755 (executable)
--- 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());