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

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
index cac5bd6507bd95ee5c44149bbddaeee6cf3a9268..ab6b614c5388864116659ba291cf31e1e3f3c7d4 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
@@ -34,12 +34,11 @@
 #include "image3DDequeUR.h"
 #include <iostream>
 #include <sstream>
+#include <ctime>
 
 // ----------------------------------------------------------------------------------
 Image3DDequeUR::Image3DDequeUR( )
 {
-
-
 #ifdef _WIN32
        this->m_GlobalPath = std::getenv("TEMP");
 #endif
@@ -51,12 +50,14 @@ Image3DDequeUR::Image3DDequeUR( )
 #endif // MACOSX
        this->m_CurrentURPos = -1;
 }
+
 // ----------------------------------------------------------------------------------
 //virtual
 Image3DDequeUR::~Image3DDequeUR( )
 {
        this->CleanHardDisk( );
 }
+
 // ----------------------------------------------------------------------------------
 //virtual
 void Image3DDequeUR::AddImagesToURContainer( VTKImageDataPointerType imgUndo,
@@ -74,6 +75,7 @@ void Image3DDequeUR::AddImagesToURContainer( VTKImageDataPointerType imgUndo,
        //Managing memory
        this->ManageMemory( );
 }
+
 // ----------------------------------------------------------------------------------
 //virtual
 ImageInfoUR* Image3DDequeUR::Undo( )
@@ -88,6 +90,7 @@ ImageInfoUR* Image3DDequeUR::Undo( )
        } //fi
        return ( imgRet );
 }
+
 // ----------------------------------------------------------------------------------
 //virtual
 ImageInfoUR* Image3DDequeUR::Redo( )
@@ -99,13 +102,12 @@ ImageInfoUR* Image3DDequeUR::Redo( )
                && ( this->m_CurrentURPos < imgURDequeSize ) )
        {
                imgRet = this->m_ImgURDeque[ m_CurrentURPos ];
-       } //fi
-       else
-       {
+       } else {
                this->m_CurrentURPos--;
        }
        return ( imgRet );
 }
+
 // ----------------------------------------------------------------------------------
 //virtual
 void Image3DDequeUR::CleanURContainerFromIndex( const int& index )
@@ -122,39 +124,38 @@ void Image3DDequeUR::CleanURContainerFromIndex( const int& index )
                this->m_ImgURDeque.pop_back( );
        } //rof
 }
+
 // ----------------------------------------------------------------------------------
 //virtual
 void Image3DDequeUR::ManageMemory( )
 {
        int imgURDequeSize = this->m_ImgURDeque.size( );
-       for( int i = 0; i < imgURDequeSize; i++ )
+       int i;
+       for( i = 0; i < imgURDequeSize; i++ )
        {
                if( this->m_ImgURDeque[ i ]->GetStatus( ) )
                {
-                       this->m_ImgURDeque[ i ]->RemoveImagesFromMemory(
-                               this->m_GlobalPath );
-               } //fi
-       } //rof
+                       this->m_ImgURDeque[ i ]->RemoveImagesFromMemory( this->m_GlobalPath );
+               } // if Status
+       } // for i
          //Adding CurrentUndoPos to memory
-       if( ( this->m_CurrentURPos != -1 )
-               && !( this->m_ImgURDeque[ this->m_CurrentURPos ]->GetStatus( ) ) )
+       if( ( this->m_CurrentURPos != -1 ) && !( this->m_ImgURDeque[ this->m_CurrentURPos ]->GetStatus( ) ) )
        {
-               this->m_ImgURDeque[ this->m_CurrentURPos ]->LoadImagesToMemory(
-                       this->m_GlobalPath );
+               this->m_ImgURDeque[ this->m_CurrentURPos ]->LoadImagesToMemory( this->m_GlobalPath );
        }
        int currentRedoPos = this->m_CurrentURPos + 1;
-       if( ( currentRedoPos < imgURDequeSize )
-               && !( this->m_ImgURDeque[ currentRedoPos ]->GetStatus( ) ) )
+       if( ( currentRedoPos < imgURDequeSize ) && !( this->m_ImgURDeque[ currentRedoPos ]->GetStatus( ) ) )
        {
-               this->m_ImgURDeque[ currentRedoPos ]->LoadImagesToMemory(
-                       this->m_GlobalPath );
+               this->m_ImgURDeque[ currentRedoPos ]->LoadImagesToMemory( this->m_GlobalPath );
        }
 }
+
 // ----------------------------------------------------------------------------------
 void Image3DDequeUR::SetGlobalPath( const StringType& globalPath )
 {
        this->m_GlobalPath = globalPath;
 }
+
 // ----------------------------------------------------------------------------------
 void Image3DDequeUR::CleanHardDisk( )
 {
@@ -163,11 +164,13 @@ void Image3DDequeUR::CleanHardDisk( )
                this->m_ImgURDeque[ i ]->RemoveImagesFromDisk( this->m_GlobalPath );
        }
 }
+
 // ----------------------------------------------------------------------------------
 Image3DDequeUR::StringType Image3DDequeUR::GetGlobalPath( )
 {
        return ( this->m_GlobalPath );
 }
+
 // ----------------------------------------------------------------------------------
 Image3DDequeUR::StringType Image3DDequeUR::GetImageName( const int & pos )
 {
@@ -189,4 +192,5 @@ Image3DDequeUR::StringType Image3DDequeUR::GetImageName( const int & pos )
        StringType imageName = this->m_IDImages + ss.str( );
        return ( imageName );
 }
+
 // ----------------------------------------------------------------------------------