DFCH: imageUndoRedo + Manual Paint: It doesn't works :s :s

[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 41d7c56ec0b673f7a0d54b7066c55d1a2957dc8d..d1d959d251faa709fb5cc9dd2728293ab9b615a3 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
@@ -3,123 +3,68 @@
 #include <sstream>
 
 Image3DDequeUR::Image3DDequeUR() {
-       this->m_GlobalPath = "/home/caceres/temporal/";
-       this->m_CurrentUndoPos = -1;
-       this->m_CurrentRedoPos = -1;
+       this->m_GlobalPath = "/home/pechan/temporal/";
+       this->m_CurrentURPos = -1;
 }
 //virtual
 Image3DDequeUR::~Image3DDequeUR() {
        this->CleanHardDisk();
 }
 //virtual
-void Image3DDequeUR::AddImageToUndoContainer(VTKImageDataPointerType img,
-               ImageMManagerType* imMManager) {
-       this->CleanUndoContainerFromIndex(this->m_CurrentUndoPos + 1);
+void Image3DDequeUR::AddImagesToURContainer(VTKImageDataPointerType imgUndo,
+               VTKImageDataPointerType imgRedo, ImageMManager* imMManager) {
+       this->CleanURContainerFromIndex(this->m_CurrentURPos + 1);
        //Adding image
        ImageInfoUR* imageInfo = new ImageInfoUR();
        imageInfo->SetImageName(
-                       this->GetImageName(this->m_ImgUndoDeque.size(), true));
-       imageInfo->SetImage(img);
+                       this->GetImageName(this->m_ImgURDeque.size(), true));
+       imageInfo->SetImages(imgUndo, imgRedo);
        imageInfo->SetImageMManager(imMManager);
        //Adding to deque
-       this->m_ImgUndoDeque.push_back(imageInfo);
-       this->m_CurrentUndoPos = this->m_ImgUndoDeque.size() - 1;
+       this->m_ImgURDeque.push_back(imageInfo);
+       this->m_CurrentURPos = this->m_ImgURDeque.size() - 1;
        //Managing memory
        this->ManageMemory();
-       //clean redo container
-       this->CleanRedoContainer();
 }
 //virtual
 ImageInfoUR* Image3DDequeUR::Undo() {
        ImageInfoUR* imgRet = NULL;
-       if ((this->m_ImgUndoDeque.size() > 0) && (this->m_CurrentUndoPos != -1)) {
-               imgRet = this->m_ImgUndoDeque[m_CurrentUndoPos];
-               this->m_CurrentUndoPos--;
+       if ((this->m_ImgURDeque.size() > 0) && (this->m_CurrentURPos != -1)) {
+               imgRet = this->m_ImgURDeque[m_CurrentURPos];
+               this->m_CurrentURPos--;
        } //fi
        return (imgRet);
 }
-//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 = 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
-void Image3DDequeUR::CleanUndoContainerFromIndex(const int& index) {
+void Image3DDequeUR::CleanURContainerFromIndex(const int& index) {
        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);
+       for (unsigned int i = index; i < this->m_ImgURDeque.size(); i++) {
+               this->m_ImgURDeque[i]->RemoveImagesFromMemory(this->m_GlobalPath);
+               this->m_ImgURDeque[i]->RemoveImagesFromDisk(this->m_GlobalPath);
                count++;
        }
        for (int i = 0; i < count; i++) {
-               this->m_ImgUndoDeque.pop_back();
+               this->m_ImgURDeque.pop_back();
        } //rof
 }
-//virtual
-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() {
-       for (unsigned int i = 0; i < this->m_ImgUndoDeque.size(); i++) {
-               this->m_ImgUndoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
-               this->m_ImgUndoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
-       } //rof
-       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);
-       } //rof
-       this->m_ImgRedoDeque.clear();
-       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);
+       for (int i = 0; (unsigned int) i < this->m_ImgURDeque.size(); i++) {
+               if (this->m_ImgURDeque[i]->GetStatus()) {
+                       this->m_ImgURDeque[i]->RemoveImagesFromMemory(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
-       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(
+       if ((this->m_CurrentURPos != -1)
+                       && !(this->m_ImgURDeque[this->m_CurrentURPos]->GetStatus())) {
+               this->m_ImgURDeque[this->m_CurrentURPos]->LoadImagesToMemory(
                                this->m_GlobalPath);
        }
 }
@@ -129,8 +74,8 @@ void Image3DDequeUR::SetGlobalPath(const StringType& globalPath) {
 }
 
 void Image3DDequeUR::CleanHardDisk() {
-       for (unsigned int i = 0; i < this->m_ImgUndoDeque.size(); i++) {
-               this->m_ImgUndoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
+       for (unsigned int i = 0; i < this->m_ImgURDeque.size(); i++) {
+               this->m_ImgURDeque[i]->RemoveImagesFromDisk(this->m_GlobalPath);
        }
 }
 
@@ -154,12 +99,6 @@ Image3DDequeUR::StringType Image3DDequeUR::GetImageName(const int & pos,
        }
        std::stringstream ss; //create a stringstream
        ss << pos; //add number to the stream
-       StringType imgType;
-       if (undo) {
-               imgType = "undo";
-       } else {
-               imgType = "redo";
-       }
-       StringType imageName = this->m_IDImages + imgType + ss.str();
+       StringType imageName = this->m_IDImages + ss.str();
        return (imageName);
 }