DFCH: ManualPaint + ImageUndoRedo. undo 90% (with memory management but it doesn...

[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 2b7f1401bf39bd0123633f38afb439d03ee1f8df..93efb5bd6752b03e74448dfa1a8f781ed1c6b69f 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
@@ -20,13 +20,11 @@ void Image3DDequeUR::AddImageToUndoContainer(VTKImageDataPointerType img,
                        this->GetImageName(this->m_ImgUndoDeque.size(), true));
        imageInfo->SetImage(img);
        imageInfo->SetImageMManager(imMManager);
-       ///---------------------------------------------------------------------------------------------------
-       // Uncoment the following line
-       //imageInfo->SaveImageAsMHD(this->m_GlobalPath);
-       ///------------------------------------------------------------------------------------------------
        //Adding to deque
        this->m_ImgUndoDeque.push_back(imageInfo);
        this->m_CurrentUndoPos = this->m_ImgUndoDeque.size() - 1;
+       //Managing memory
+       this->ManageMemory();
 }
 //virtual
 ImageInfoUR* Image3DDequeUR::Undo() {
@@ -49,19 +47,19 @@ ImageInfoUR* Image3DDequeUR::Redo() {
 }
 //virtual
 void Image3DDequeUR::CleanUndoContainerFromIndex(const int& index) {
-       for (int i = index; i < this->m_ImgUndoDeque.size(); i++) {
+       int count = 0;
+       for (unsigned int i = index; i < this->m_ImgUndoDeque.size(); i++) {
                this->m_ImgUndoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
                this->m_ImgUndoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
-               this->m_ImgUndoDeque.pop_back();
+               count++;
        }
+       for (int i = 0; i < count; i++) {
+               this->m_ImgUndoDeque.pop_back();
+       } //rof
+
 }
 //virtual
 void Image3DDequeUR::CleanRedoContainerFromIndex(const int& index) {
-       for (int i = index; i < this->m_ImgRedoDeque.size(); i++) {
-               this->m_ImgRedoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
-               this->m_ImgRedoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
-               this->m_ImgRedoDeque.pop_back();
-       }
 }
 //virtual
 void Image3DDequeUR::CleanContainers() {
@@ -77,6 +75,22 @@ void Image3DDequeUR::CleanContainers() {
        this->m_ImgUndoDeque.clear();
 }
 
+//virtual
+void Image3DDequeUR::ManageMemory() {
+       for (int i = 0; (unsigned int) i < this->m_ImgUndoDeque.size(); i++) {
+               if (this->m_ImgUndoDeque[i]->GetStatus()) {
+                       this->m_ImgUndoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
+               } //fi
+       } //rof
+         //Adding CurrentUndoPos to memory
+       if ((this->m_CurrentUndoPos != -1)
+                       && !(this->m_ImgUndoDeque[this->m_CurrentUndoPos]->GetStatus())) {
+               this->m_ImgUndoDeque[this->m_CurrentUndoPos]->LoadImageMHDToMemory(
+                               this->m_GlobalPath);
+       }
+       //The same for the redo queue
+}
+
 void Image3DDequeUR::SetGlobalPath(const StringType& globalPath) {
        this->m_GlobalPath = globalPath;
 }