X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FimageUndoRedo%2FimageUndoRedo.cxx;h=cba183cac36e253477109ac70bcdc0734dc50be8;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=7672f4efe942636d4d60b7d65a5c459b32ed7926;hpb=a55972486c881d811de6c5d2b68f5d1b2885ac11;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 7672f4e..cba183c 100755 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + /*! * @file imageUndoRedo.cxx * @brief This file contains the implementation of the ImageUndoRedo class. @@ -9,101 +34,164 @@ #include "imageUndoRedo.h" // ---------------------------------------------------------------------------------- -ImageUndoRedo::ImageUndoRedo() { - this->m_ImagesDeque = new IDequeType(); +ImageUndoRedo::ImageUndoRedo() +{ + this->m_ImagesDeque = new IDequeType( ); } + // ---------------------------------------------------------------------------------- //virtual -ImageUndoRedo::~ImageUndoRedo() { - +ImageUndoRedo::~ImageUndoRedo( ) +{ } + // ---------------------------------------------------------------------------------- //virtual -void ImageUndoRedo::Undo() { - ImageInfoUR* imageInfo = this->m_ImagesDeque->Undo(); - if (imageInfo != NULL) { - this->DrawUR(imageInfo, true); - this->UpdateUndoImage(); - } +void ImageUndoRedo::Undo( ) +{ + ImageInfoUR* imageInfo = this->m_ImagesDeque->Undo( ); + if( imageInfo != NULL) + { + this->DrawUR( imageInfo, true ); + this->UpdateUndoImage( ); + } //if imageInfo } // ---------------------------------------------------------------------------------- //virtual -void ImageUndoRedo::Redo() { - ImageInfoUR* imageInfo = this->m_ImagesDeque->Redo(); - if (imageInfo != NULL) { - this->DrawUR(imageInfo, false); - this->UpdateUndoImage(); +void ImageUndoRedo::Redo( ) +{ + ImageInfoUR* imageInfo = this->m_ImagesDeque->Redo( ); + if( imageInfo != NULL) + { + this->DrawUR( imageInfo, false ); + this->UpdateUndoImage( ); } } // ---------------------------------------------------------------------------------- -void ImageUndoRedo::SetImage(VTKImageDataPointerType image) { +void ImageUndoRedo::SetImage( VTKImageDataPointerType image ) +{ this->m_CurrentImage = image; - this->m_CurrentImage->Update(); - this->UpdateUndoImage(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + this->m_CurrentImage->Update( ); +#else + this->m_CurrentImage->Modified( ); +#endif + + this->UpdateUndoImage( ); } + // ---------------------------------------------------------------------------------- //virtual -void ImageUndoRedo::SetURImages(ImageMManagerType* imMManager) { - ImageMManagerType* newImageManager = new ImageMManagerType(imMManager); - if (newImageManager->ValidateRegion()) { - RegionSType region = newImageManager->GetModifiedRegion(); - VTKImageDataPointerType imgUndo = this->GetImageRegion(region, - this->m_UndoImage); - VTKImageDataPointerType imgRedo = this->GetImageRegion(region, - this->m_CurrentImage); - this->m_ImagesDeque->AddImagesToURContainer(imgUndo, imgRedo, - newImageManager); - this->UpdateUndoImage(); +void ImageUndoRedo::SetURImages( ImageMManagerType* imMManager ) +{ + ImageMManagerType* newImageManager = new ImageMManagerType( imMManager ); + if( newImageManager->ValidateRegion( ) ) + { + RegionSType region = newImageManager->GetModifiedRegion( ); + VTKImageDataPointerType imgUndo = this->GetImageRegion( region,this->m_UndoImage ); + VTKImageDataPointerType imgRedo = this->GetImageRegion( region,this->m_CurrentImage ); + this->m_ImagesDeque->AddImagesToURContainer( imgUndo, imgRedo,newImageManager ); + this->UpdateUndoImage( ); } 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(); +void ImageUndoRedo::UpdateUndoImage( ) +{ +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + this->m_CurrentImage->Update( ); +#else + this->m_CurrentImage->Modified( ); +#endif + this->m_UndoImage = VTKImageDataPointerType::New( ); + this->m_UndoImage->DeepCopy( m_CurrentImage ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + this->m_UndoImage->Update( ); +#else + this->m_UndoImage->Modified( ); +#endif } + // ---------------------------------------------------------------------------------- -ImageUndoRedo::VTKImageDataPointerType ImageUndoRedo::GetImageRegion( - const RegionSType& region, VTKImageDataPointerType img) { - VTKExtractVOIPointerType extract = VTKExtractVOIPointerType::New(); - extract->SetVOI(region.minX, region.maxX, region.minY, region.maxY, - region.minZ, region.maxZ); - extract->SetSampleRate(1, 1, 1); - extract->SetInput(img); - VTKImageDataPointerType imgResult = extract->GetOutput(); - imgResult->Update(); - return (imgResult); +ImageUndoRedo::VTKImageDataPointerType ImageUndoRedo::GetImageRegion( const RegionSType& region, VTKImageDataPointerType img ) +{ + VTKExtractVOIPointerType extract = VTKExtractVOIPointerType::New( ); + extract->SetVOI( region.minX, region.maxX, region.minY, region.maxY,region.minZ, region.maxZ ); + extract->SetSampleRate( 1, 1, 1 ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + extract->SetInput( img ); +#else + extract->SetInputData( img ); + extract->Update(); +#endif + VTKImageDataPointerType imgResult = extract->GetOutput( ); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + imgResult->Update( ); +#else + imgResult->Modified( ); +#endif + return ( imgResult ); } // ---------------------------------------------------------------------------------- -void ImageUndoRedo::SetCurrentImage(VTKImageDataPointerType img) { +void ImageUndoRedo::SetCurrentImage( VTKImageDataPointerType img ) +{ this->m_CurrentImage = img; } // ---------------------------------------------------------------------------------- //virtual -void ImageUndoRedo::DrawUR(ImageInfoUR* imageInfo, const bool& undo) { +void ImageUndoRedo::DrawUR( ImageInfoUR* imageInfo, const bool& undo ) +{ VTKImageDataPointerType img; - if (undo) { - img = imageInfo->GetUndoImage(); - } //fi - else { - img = imageInfo->GetRedoImage(); + if( undo ) + { + img = imageInfo->GetUndoImage( ); + } else { + img = imageInfo->GetRedoImage( ); } //else - 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(); + RegionSType region = imageInfo->GetImageMManager()->GetModifiedRegion(); + m_RestorBaseInitialPointX = imageInfo->GetImageMManager()->GetBaseInitialPointX(); + m_RestorBaseInitialPointY = imageInfo->GetImageMManager()->GetBaseInitialPointY(); + m_RestorBaseInitialPointZ = imageInfo->GetImageMManager()->GetBaseInitialPointZ(); + + if( img != NULL) + { + int *dim = img->GetDimensions( ); + int sizeXImageIn = dim[ 0 ]; + size_t linesize = sizeXImageIn * sizeof(unsigned short); + for( int j = region.minY, y = 0; j <= region.maxY; j++, y++ ) + { + for( int k = region.minZ, z = 0; k <= region.maxZ; k++, z++ ) + { + void* ptrsrc = img->GetScalarPointer( 0, y, z ); + void* ptrdest = this->m_CurrentImage->GetScalarPointer( region.minX, j, k ); + memcpy( ptrdest, ptrsrc, linesize ); + } // for k + } // for j + this->m_CurrentImage->Modified( ); + } // if img + this->m_ImagesDeque->ManageMemory( ); } // ---------------------------------------------------------------------------------- + +int ImageUndoRedo::GetRestorBaseInitialPointX() +{ + return m_RestorBaseInitialPointX; +} + +int ImageUndoRedo::GetRestorBaseInitialPointY() +{ + return m_RestorBaseInitialPointY; +} + +int ImageUndoRedo::GetRestorBaseInitialPointZ() +{ + return m_RestorBaseInitialPointZ; +} +