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=d6b0d5ba1f2eb8b6e004e261a56147df45330240;hpb=1875ac5ea44f35fb7259e847f628bb840e3964a8;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 d6b0d5b..956fe6a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -1,105 +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()
-{
-    _graylevel  =   0.0;
-    _brushsize  =   1;
-    _brushform  =   0;      // 0 rectangle-box  ,   1 circle-sphere
-    _2D3D       =   0;      // 0 2D             ,   1 true 3D
-    _brushtool  =   0;      // 0 pensil         ,   1 fill
+ManualPaintModel::ManualPaintModel() {
+	_tool = 0; // 0 pencil         ,   1 fill
+	_brushfilter = new BrushFilter();
+	_fillfilter = new FillFilter();
+	_imageUndoRedo = new ImageUndoRedo();
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel()
-{
+ManualPaintModel::~ManualPaintModel() {
+	delete _brushfilter;
+	delete _fillfilter;
 }
 
-void ManualPaintModel::SetImage(vtkImageData *image)
-{
-    _image=image;
+//---------------------------------------------------------------------------
+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)
-{
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetTool(int tool) {
+	_tool = tool;
+}
 
-    printf("EED ManualPaintModel::PaintImage %d %d %d\n", px,py,pz);
-    if (_image!=NULL)
-    {
-        float value=(float)_graylevel;
-        int i,j,k;
-        int size = _brushsize-1;
-        int minX=px-size;
-        int maxX=px+size;
-        int minY=py-size;
-        int maxY=py+size;
-        int minZ=pz-size;
-        int maxZ=pz+size;
+//---------------------------------------------------------------------------
+void ManualPaintModel::Set2D3D(int dim2D3D) {
+	_brushfilter->Set2D3D(dim2D3D);
+	_fillfilter->Set2D3D(dim2D3D);
+}
 
-        double xx,yy,zz,rr=size*size;
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetImage(vtkImageData *image) {
+	_brushfilter->SetImage(image);
+	_fillfilter->SetImage(image);
+	_imageUndoRedo->SetImage(image);
+}
 
-        printf("EED bbcreaMaracasvisu::vtkInteractorManualPaint::PaintImage brushForm=%d\n",_brushform);
-        for (i=minX; i<=maxX; i++)
-        {
-            xx=px-i;
-            xx=xx*xx;
-            for (j=minY; j<=maxY; j++)
-            {
-                yy=py-j;
-                yy=yy*yy;
-                for (k=minZ; k<=maxZ; k++)
-                {
-                    zz=pz-k;
-                    zz=zz*zz;
-                    if (_brushform==0)
-                    {
-                        _image->SetScalarComponentFromFloat (i,j,k, 0, value );
-                    } else if (_brushform==1)
-                    {
-                        if ((xx+yy+zz)<=rr)
-                        {
-                            _image->SetScalarComponentFromFloat (i,j,k, 0, value );
-                        }
-                    } // _brushform
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetGrayLevel(double graylevel) {
+	_brushfilter->SetGrayLevel(graylevel);
+	_fillfilter->SetGrayLevel(graylevel);
+}
 
-                }//k
-            }//j
-        }//i
-        _image->Modified();
-    } else  {
-        printf("ERROR : bbcreaMaracasvisu::vtkInteractorManualPaint::PaintImage :  Image not set. \n");
-    } // _image
+//---------------------------------------------------------------------------
+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 )
-{
-    _brushsize = brushsize;
+void ManualPaintModel::SetDirection(int direction) {
+	_brushfilter->SetDirection(direction);
+	_fillfilter->SetDirection(direction);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetGrayLevel( double graylevel )
-{
-    _graylevel = graylevel;
+void ManualPaintModel::SetBrushSize(int brushsize) {
+	_brushfilter->SetBrushSize(brushsize);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushForm( int brushform )
-{
-    _brushform = brushform;
+void ManualPaintModel::SetBrushForm(int brushform) {
+	_brushfilter->SetBrushForm(brushform);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushTool( int brushtool )
-{
-    _brushtool = brushtool;
+void ManualPaintModel::SetToleranceFill(double tolerancefill) {
+	_fillfilter->SetToleranceFill(tolerancefill);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::Set2D3D( int dim2D3D )
-{
-    _2D3D = dim2D3D;
+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();
+}