X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintModel.cpp;h=956fe6a560f62341e0803fc6d269654c0a656a87;hb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;hp=6414f887227c789aa2de213d1f1a6abd6ddb9c0a;hpb=bdde32eafd443eacaca7876a95d5a64bce9aa471;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp index 6414f88..956fe6a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp @@ -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. +# ------------------------------------------------------------------------ */ + #include "ManualPaintModel.h" ManualPaintModel::ManualPaintModel() { @@ -93,15 +118,15 @@ void ManualPaintModel::GetScalarRange(double * range) { //--------------------------------------------------------------------------- void ManualPaintModel::SetUndoImage() { ImageMManager* imMManager = NULL; - if (_tool == 0) { - imMManager = this->_brushfilter->GetImageMManager(); - } - if (_tool == 1) { - imMManager = this->_fillfilter->GetImageMManager(); - } - this->_imageUndoRedo->SetUndoImage(imMManager); - this->_brushfilter->CleanImageMManager(); - this->_fillfilter->CleanImageMManager(); + if (_tool == 0) { + imMManager = this->_brushfilter->GetImageMManager(); + } + if (_tool == 1) { + imMManager = this->_fillfilter->GetImageMManager(); + } + this->_imageUndoRedo->SetURImages(imMManager); + this->_brushfilter->CleanImageMManager(); + this->_fillfilter->CleanImageMManager(); } //---------------------------------------------------------------------------