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=ee34a4a27638d75ab615250b4bf78a9dce7de7dc;hpb=5c6b0f79c56a52bb4b7fa4beff359ba99ae3293a;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 ee34a4a..956fe6a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -1,94 +1,139 @@
+/*# ---------------------------------------------------------------------
+#
+# 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()
-{
-    _tool           =  0;      // 0 pencil         ,   1 fill
-    _brushfilter    =  new BrushFilter();
-    _fillfilter     =  new FillFilter();
+ManualPaintModel::ManualPaintModel() {
+	_tool = 0; // 0 pencil         ,   1 fill
+	_brushfilter = new BrushFilter();
+	_fillfilter = new FillFilter();
+	_imageUndoRedo = new ImageUndoRedo();
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel()
-{
-    delete _brushfilter;
-    delete _fillfilter;
+ManualPaintModel::~ManualPaintModel() {
+	delete _brushfilter;
+	delete _fillfilter;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::PaintImage(int px,int py, int pz)
-{
-    if (_tool==0)
-    {
-        _brushfilter->SetPoint(px,py,pz);
-        _brushfilter->Run();
-    }
-    if (_tool==1)
-    {
-        _fillfilter->SetPoint(px,py,pz);
-        _fillfilter->Run();
-    }
+void ManualPaintModel::PaintImage(int px, int py, int pz) {
+	if (_tool == 0) {
+		_brushfilter->SetPoint(px, py, pz);
+		_brushfilter->Run();
+	}
+	if (_tool == 1) {
+		_fillfilter->SetPoint(px, py, pz);
+		_fillfilter->Run();
+	}
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetTool( int tool )
-{
-    _tool = tool;
+void ManualPaintModel::SetTool(int tool) {
+	_tool = tool;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::Set2D3D( int dim2D3D )
-{
-    _brushfilter->Set2D3D(dim2D3D);
-    _fillfilter->Set2D3D(dim2D3D);
+void ManualPaintModel::Set2D3D(int dim2D3D) {
+	_brushfilter->Set2D3D(dim2D3D);
+	_fillfilter->Set2D3D(dim2D3D);
 }
 
-
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetImage(vtkImageData *image)
-{
-    _brushfilter->SetImage(image);
-    _fillfilter->SetImage(image);
+void ManualPaintModel::SetImage(vtkImageData *image) {
+	_brushfilter->SetImage(image);
+	_fillfilter->SetImage(image);
+	_imageUndoRedo->SetImage(image);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetGrayLevel( double graylevel )
-{
-    _brushfilter->SetGrayLevel(graylevel);
-    _fillfilter->SetGrayLevel(graylevel);
+void ManualPaintModel::SetGrayLevel(double graylevel) {
+	_brushfilter->SetGrayLevel(graylevel);
+	_fillfilter->SetGrayLevel(graylevel);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDirection(int direction)
-{
-    _brushfilter->SetDirection(direction);
-    _fillfilter->SetDirection(direction);
+void ManualPaintModel::SetRangeMin(int min) {
+	_brushfilter->SetRangeMin(min);
+	_fillfilter->SetRangeMin(min);
 }
 
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetRangeMax(int max) {
+	_brushfilter->SetRangeMax(max);
+	_fillfilter->SetRangeMax(max);
+}
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushSize( int brushsize )
-{
-    _brushfilter->SetBrushSize(brushsize);
+void ManualPaintModel::SetDirection(int direction) {
+	_brushfilter->SetDirection(direction);
+	_fillfilter->SetDirection(direction);
 }
 
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetBrushSize(int brushsize) {
+	_brushfilter->SetBrushSize(brushsize);
+}
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushForm( int brushform )
-{
-    _brushfilter->SetBrushForm(brushform);
+void ManualPaintModel::SetBrushForm(int brushform) {
+	_brushfilter->SetBrushForm(brushform);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetToleranceFill(double tolerancefill)
-{
-    _fillfilter->SetToleranceFill(tolerancefill);
+void ManualPaintModel::SetToleranceFill(double tolerancefill) {
+	_fillfilter->SetToleranceFill(tolerancefill);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDistanceFill(int distancefill)
-{
-    _fillfilter->SetDistanceFill(distancefill);
+void ManualPaintModel::SetDistanceFill(int distancefill) {
+	_fillfilter->SetDistanceFill(distancefill);
+}
+//---------------------------------------------------------------------------
+void ManualPaintModel::GetScalarRange(double * range) {
+	_fillfilter->GetScalarRange(range);
+}
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetUndoImage() {
+	ImageMManager* imMManager = NULL;
+	 if (_tool == 0) {
+	 imMManager = this->_brushfilter->GetImageMManager();
+	 }
+	 if (_tool == 1) {
+	 imMManager = this->_fillfilter->GetImageMManager();
+	 }
+	 this->_imageUndoRedo->SetURImages(imMManager);
+	 this->_brushfilter->CleanImageMManager();
+	 this->_fillfilter->CleanImageMManager();
 }
+//---------------------------------------------------------------------------
 
+void ManualPaintModel::Undo() {
+	this->_imageUndoRedo->Undo();
+}
+
+void ManualPaintModel::Redo() {
+	this->_imageUndoRedo->Redo();
+}