X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FimageUndoRedo%2FimageUndoRedo.cxx;h=bf524449210ba8fbfb52bd3bb26f211cce39ca59;hb=d725af03e25b41e03b212c26068be2c04dacd270;hp=dd9bcecf4d3e6233b5a2d79d754f38d075b9b374;hpb=ada3e60bcd998550327dac4f95b65f0c113f063b;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx index dd9bcec..bf52444 100755 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx @@ -19,14 +19,18 @@ 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(); + if (imageInfo != NULL) + { + this->DrawUR(imageInfo); + }*/ } void ImageUndoRedo::SetImage(VTKImageDataPointerType image) { this->m_CurrentImage = image; @@ -48,11 +52,19 @@ void ImageUndoRedo::SetUndoImage(ImageMManagerType* imMManager) { } } //virtual -void ImageUndoRedo::SetRedoImage(const ImageMManagerType* imMManager) { - /*RegionSType region = imMManager.GetModifiedRegion(); - VTKImageDataPointerType imgResult = this->ImageMManagerType(region, - this->m_CurrentImage); - this->m_ImagesDeque->AddImageToRedoContainer(imgResult, imMManager);*/ +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() {