*** empty log message ***

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
index 55a4e1f24b9fc907f100e6396a65247d05ab75f2..bf524449210ba8fbfb52bd3bb26f211cce39ca59 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
@@ -19,70 +19,92 @@ void ImageUndoRedo::Undo() {
        ImageInfoUR* imageInfo = this->m_ImagesDeque->Undo();
        if (imageInfo != NULL)
        {
-               //this->SetRedoImage(imageInfo->GetRegion());
+               //this->SetRedoImage(imageInfo->GetImageMManager());
                this->DrawUR(imageInfo);
+               this->UpdateUndoImage();
        }
 }
 //virtual
 void ImageUndoRedo::Redo() {
-       ImageInfoUR* imageInfo = this->m_ImagesDeque->Redo();
-       this->DrawUR(imageInfo);
+       /*ImageInfoUR* imageInfo = this->m_ImagesDeque->Redo();
+       if (imageInfo != NULL)
+       {
+               this->DrawUR(imageInfo);
+       }*/
 }
 void ImageUndoRedo::SetImage(VTKImageDataPointerType image) {
        this->m_CurrentImage = image;
        this->m_CurrentImage->Update();
-       this->m_OriginalImage = VTKImageDataPointerType::New();
-       this->m_OriginalImage->DeepCopy(m_CurrentImage);
+       this->UpdateUndoImage();
 }
 //virtual
-void ImageUndoRedo::SetUndoImage(const RegionSType& region) {
-       VTKImageDataPointerType imgResult = this->GetImageRegion(region,
-                       this->m_OriginalImage);
-       this->m_ImagesDeque->AddImageToUndoContainer(imgResult, region);
+void ImageUndoRedo::SetUndoImage(ImageMManagerType* imMManager) {
+       ImageMManagerType* newImageManager = new ImageMManagerType(imMManager);
+       if (newImageManager->ValidateRegion()) {
+               RegionSType region = newImageManager->GetModifiedRegion();
+               VTKImageDataPointerType imgResult = this->GetImageRegion(region,
+                               this->m_UndoImage);
+               this->m_ImagesDeque->AddImageToUndoContainer(imgResult,
+                               newImageManager);
+               this->UpdateUndoImage();
+       } else {
+               std::cerr << "INVALID REGION" << std::endl;
+       }
 }
 //virtual
-void ImageUndoRedo::SetRedoImage(const RegionSType& region) {
-       VTKImageDataPointerType imgResult = this->GetImageRegion(region,
-                       this->m_CurrentImage);
-       this->m_ImagesDeque->AddImageToRedoContainer(imgResult, region);
+void ImageUndoRedo::SetRedoImage(ImageMManagerType* imMManager) {
+       /*this->m_CurrentImage->Update();
+       ImageMManagerType* newImageManager = new ImageMManagerType(imMManager);
+       if (newImageManager->ValidateRegion()) {
+               RegionSType region = newImageManager->GetModifiedRegion();
+               VTKImageDataPointerType imgResult = this->GetImageRegion(region,
+                               this->m_CurrentImage);
+               this->m_ImagesDeque->AddImageToRedoContainer(imgResult,
+                               newImageManager);
+               imgResult->Update();
+       } else {
+               std::cerr << "INVALID REGION" << std::endl;
+       }*/
+}
+
+void ImageUndoRedo::UpdateUndoImage() {
+       this->m_CurrentImage->Update();
+       this->m_UndoImage = VTKImageDataPointerType::New();
+       this->m_UndoImage->DeepCopy(m_CurrentImage);
+       this->m_UndoImage->Update();
 }
 
 ImageUndoRedo::VTKImageDataPointerType ImageUndoRedo::GetImageRegion(
                const RegionSType& region, VTKImageDataPointerType img) {
        VTKExtractVOIPointerType extract = VTKExtractVOIPointerType::New();
-       VTKImageDataPointerType imgResult = VTKImageDataPointerType::New();
        extract->SetVOI(region.minX, region.maxX, region.minY, region.maxY,
                        region.minZ, region.maxZ);
        extract->SetSampleRate(1, 1, 1);
-       extract->SetInput(this->m_OriginalImage);
-       imgResult = extract->GetOutput();
+       extract->SetInput(this->m_UndoImage);
+       VTKImageDataPointerType imgResult = extract->GetOutput();
+       imgResult->Update();
        return (imgResult);
 }
 
-void ImageUndoRedo::SetOriginalImage(VTKImageDataPointerType img) {
-       this->m_OriginalImage = img;
-}
 void ImageUndoRedo::SetCurrentImage(VTKImageDataPointerType img) {
        this->m_CurrentImage = img;
 }
 //virtual
 void ImageUndoRedo::DrawUR(ImageInfoUR* imageInfo) {
        VTKImageDataPointerType img = imageInfo->GetImage();
-       if( img != NULL )
-       {
-               for (int i = imageInfo->GetRegion().minX, x = 0;
-                               i <= imageInfo->GetRegion().maxX; i++, x++) {
-                       for (int j = imageInfo->GetRegion().minY, y = 0;
-                                       j <= imageInfo->GetRegion().maxY; j++, y++) {
-                               for (int k = imageInfo->GetRegion().minZ, z = 0;
-                                               k <= imageInfo->GetRegion().maxZ; k++, z++) {
-                                       float value = img->GetScalarComponentAsFloat(i, j, k, 0);
-                                       this->m_CurrentImage->SetScalarComponentFromFloat(i, j, k, 0,
-                                                       value);
+       RegionSType region = imageInfo->GetImageMManager()->GetModifiedRegion();
+       if (img != NULL) {
+               for (int i = region.minX, x = 0; i <= region.maxX; i++, x++) {
+                       for (int j = region.minY, y = 0; j <= region.maxY; j++, y++) {
+                               for (int k = region.minZ, z = 0; k <= region.maxZ; k++, z++) {
+                                       float value = img->GetScalarComponentAsFloat(x, y, z, 0);
+                                       this->m_CurrentImage->SetScalarComponentFromFloat(i, j, k,
+                                                       0, value);
                                } //rof
                        } //rof
                } //rof
                this->m_CurrentImage->Modified();
        }
+       this->m_ImagesDeque->ManageMemory();
 }