#3332 creaContours Bug New - Manual Paint UnDo ReDo with vtk update (working)

[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 fd668577e9ced6496832e80f23bc2e5e1f2738af..ca2f43544bb6ae10259b9e2c5b7b339feadd33c7 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
@@ -36,53 +36,63 @@
 // ----------------------------------------------------------------------------------
 ImageInfoUR::ImageInfoUR() 
 {
-       this->m_OnMemory = false;
-       this->m_OnDisk = false;
+       this->m_OnMemory        = false;
+       this->m_OnDisk          = false;
 }
+
 // ----------------------------------------------------------------------------------
 ImageInfoUR::~ImageInfoUR() 
 {
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::SetImageName(const StringType &imgName) 
 {
-       this->m_ImageName = imgName;
+       this->m_ImageName               = imgName;
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::SetImageMManager(ImageMManagerType* imMManager) 
 {
-       this->m_ImageMManager = imMManager;
+       this->m_ImageMManager   = imMManager;
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::SetStatus(const bool& onMemory) 
 {
-       this->m_OnMemory = onMemory;
+       this->m_OnMemory                = onMemory;
 }
+
 // ----------------------------------------------------------------------------------
 ImageInfoUR::StringType ImageInfoUR::GetImageName() 
 {
        return (this->m_ImageName);
 }
+
 // ----------------------------------------------------------------------------------
 ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetUndoImage() 
 {
        return (this->m_UndoImage);
 }
+
 // ----------------------------------------------------------------------------------
 ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetRedoImage() 
 {
        return (this->m_RedoImage);
 }
+
 // ----------------------------------------------------------------------------------
 ImageInfoUR::ImageMManagerType* ImageInfoUR::GetImageMManager() 
 {
        return (this->m_ImageMManager);
 }
+
 // ----------------------------------------------------------------------------------
 bool ImageInfoUR::GetStatus() 
 {
        return (this->m_OnMemory);
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::SetImages(VTKImageDataPointerType imgUndo, VTKImageDataPointerType imgRedo) 
 {
@@ -90,9 +100,11 @@ void ImageInfoUR::SetImages(VTKImageDataPointerType imgUndo, VTKImageDataPointer
        this->m_RedoImage = imgRedo;
        this->SetStatus(true);
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::LoadImagesToMemory(const StringType& gPath) 
 {
+printf("EED ImageInfoUR::LoadImagesToMemory Start\n");
        //setting paths
        StringType filename = gPath + this->m_ImageName;
        StringType undoImagePath = filename + "_Undo.mhd";
@@ -100,12 +112,19 @@ void ImageInfoUR::LoadImagesToMemory(const StringType& gPath)
        //Loading Undo Image
        VTKMetaImageReaderPointerType readerUndo = VTKMetaImageReaderPointerType::New();
        readerUndo->SetFileName(undoImagePath.c_str());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       // ..
+#else
+       readerUndo->Update();
+#endif
+
        this->m_UndoImage = readerUndo->GetOutput();
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
        this->m_UndoImage->Update();
 #else
-       // ..
+       this->m_UndoImage->Modified();
 #endif
        //Loading Redo Image
        VTKMetaImageReaderPointerType readerRedo = VTKMetaImageReaderPointerType::New();
@@ -122,11 +141,15 @@ void ImageInfoUR::LoadImagesToMemory(const StringType& gPath)
 #if VTK_MAJOR_VERSION <= 5
        this->m_RedoImage->Update();
 #else
-       // ...
+       this->m_RedoImage->Modified();
 #endif
        //Updating status
        this->m_OnMemory = true;
+
+printf("EED ImageInfoUR::LoadImagesToMemory End\n");
+
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::RemoveImagesFromMemory(const StringType& gPath) 
 {
@@ -138,22 +161,24 @@ void ImageInfoUR::RemoveImagesFromMemory(const StringType& gPath)
        this->m_RedoImage = NULL;
        this->SetStatus(false);
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::SaveImagesOnDisk(const StringType& gPath) 
 {
        printf("EED ImageInfoUR::SaveImagesOnDisk Start  \n");
-       this->m_OnDisk = true;
-       StringType filename = gPath + this->m_ImageName;
-       StringType undoImagePath = filename + "_Undo.mhd";
-       StringType redoImagePath = filename + "_Redo.mhd";
+       this->m_OnDisk                          = true;
+       StringType filename             = gPath + this->m_ImageName;
+       StringType undoImagePath        = filename + "_Undo.mhd";
+       StringType redoImagePath        = filename + "_Redo.mhd";
        this->SaveImageAsMHD(undoImagePath, this->m_UndoImage);
        this->SaveImageAsMHD(redoImagePath, this->m_RedoImage);
        printf("EED ImageInfoUR::SaveImagesOnDisk %s \n", undoImagePath.c_str() );
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::RemoveImagesFromDisk(const StringType& gPath) 
 {
-       StringType filename = gPath + this->m_ImageName;
+       StringType filename             = gPath + this->m_ImageName;
        StringType undoImagePathMHD = filename + "_Undo.mhd";
        StringType redoImagePathMHD = filename + "_Redo.mhd";
        StringType undoImagePathRAW = filename + "_Undo.raw";
@@ -163,6 +188,7 @@ void ImageInfoUR::RemoveImagesFromDisk(const StringType& gPath)
        remove(undoImagePathRAW.c_str());
        remove(redoImagePathRAW.c_str());
 }
+
 // ----------------------------------------------------------------------------------
 void ImageInfoUR::SaveImageAsMHD(const StringType& filename, VTKImageDataPointerType image) 
 {