DFCH: ManualPaint- imageUNDOREDO (Undo now working but still some big changes to...

[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 d24c809cd3da16102cb71b97bdcad5167331c336..41d7c56ec0b673f7a0d54b7066c55d1a2957dc8d 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
@@ -14,6 +14,7 @@ Image3DDequeUR::~Image3DDequeUR() {
 //virtual
 void Image3DDequeUR::AddImageToUndoContainer(VTKImageDataPointerType img,
                ImageMManagerType* imMManager) {
+       this->CleanUndoContainerFromIndex(this->m_CurrentUndoPos + 1);
        //Adding image
        ImageInfoUR* imageInfo = new ImageInfoUR();
        imageInfo->SetImageName(
@@ -25,6 +26,8 @@ void Image3DDequeUR::AddImageToUndoContainer(VTKImageDataPointerType img,
        this->m_CurrentUndoPos = this->m_ImgUndoDeque.size() - 1;
        //Managing memory
        this->ManageMemory();
+       //clean redo container
+       this->CleanRedoContainer();
 }
 //virtual
 ImageInfoUR* Image3DDequeUR::Undo() {
@@ -38,11 +41,27 @@ ImageInfoUR* Image3DDequeUR::Undo() {
 //virtual
 void Image3DDequeUR::AddImageToRedoContainer(VTKImageDataPointerType img,
                ImageMManagerType* imMManager) {
+       //Adding image
+       ImageInfoUR* imageInfo = new ImageInfoUR();
+       imageInfo->SetImageName(
+                       this->GetImageName(this->m_ImgRedoDeque.size(), false));
+       imageInfo->SetImage(img);
+       imageInfo->SetImageMManager(imMManager);
+       //Adding to deque
+       this->m_ImgRedoDeque.push_back(imageInfo);
+       this->m_CurrentRedoPos = this->m_ImgRedoDeque.size() - 1;
+       //Managing memory
+       this->ManageMemory();
+
 }
 //virtual
 ImageInfoUR* Image3DDequeUR::Redo() {
-
-       ImageInfoUR* imgRet = new ImageInfoUR();
+       ImageInfoUR* imgRet = NULL;
+       if ((this->m_ImgRedoDeque.size() > 0) && (this->m_CurrentRedoPos != -1)) {
+               imgRet = this->m_ImgRedoDeque[m_CurrentRedoPos];
+               this->m_CurrentRedoPos--;
+               this->m_CurrentUndoPos++;
+       } //fi
        return (imgRet);
 }
 //virtual
@@ -56,10 +75,13 @@ void Image3DDequeUR::CleanUndoContainerFromIndex(const int& index) {
        for (int i = 0; i < count; i++) {
                this->m_ImgUndoDeque.pop_back();
        } //rof
-
 }
 //virtual
-void Image3DDequeUR::CleanRedoContainerFromIndex(const int& index) {
+void Image3DDequeUR::CleanRedoContainer() {
+       for (unsigned int i = 0; i < this->m_ImgRedoDeque.size(); i++) {
+               this->m_ImgRedoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
+               this->m_ImgRedoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
+       }
 }
 //virtual
 void Image3DDequeUR::CleanContainers() {
@@ -89,6 +111,17 @@ void Image3DDequeUR::ManageMemory() {
                                this->m_GlobalPath);
        }
        //The same for the redo queue
+       for (int i = 0; (unsigned int) i < this->m_ImgRedoDeque.size(); i++) {
+               if (this->m_ImgRedoDeque[i]->GetStatus()) {
+                       this->m_ImgRedoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
+               } //fi
+       } //rof
+         //Adding CurrentUndoPos to memory
+       if ((this->m_CurrentRedoPos != -1)
+                       && !(this->m_ImgRedoDeque[this->m_CurrentRedoPos]->GetStatus())) {
+               this->m_ImgRedoDeque[this->m_CurrentRedoPos]->LoadImageMHDToMemory(
+                               this->m_GlobalPath);
+       }
 }
 
 void Image3DDequeUR::SetGlobalPath(const StringType& globalPath) {
@@ -128,6 +161,5 @@ Image3DDequeUR::StringType Image3DDequeUR::GetImageName(const int & pos,
                imgType = "redo";
        }
        StringType imageName = this->m_IDImages + imgType + ss.str();
-       imageName.append(".mhd");
        return (imageName);
 }