X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintModel.cpp;h=868583ab83d2408dda9fdf1b30eec4c46cff8b4a;hb=f9901e756bb82bd333310b47607875331616bb29;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..868583a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -1,114 +1,211 @@
+/*# ---------------------------------------------------------------------
+#
+# 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();
-	_imageUndoRedo = new ImageUndoRedo();
+ManualPaintModel::ManualPaintModel() 
+{
+	_active 				= true;
+	_tool 					= 0; // 0 pencil         ,   1 fill
+	_brushfilter 			= new BrushFilter();
+	_fillfilter 			= new FillFilter();
+	_imageUndoRedo 			= new ImageUndoRedo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	_imageUndoRedo_visited	= new ImageUndoRedo();
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel() {
+ManualPaintModel::~ManualPaintModel() 
+{
 	delete _brushfilter;
 	delete _fillfilter;
 }
 
+
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetActive( bool active )
+{
+  _active = active;
+}
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::PaintImage(int px, int py, int pz) {
-	if (_tool == 0) {
+void ManualPaintModel::PaintImage(int px, int py, int pz) 
+{
+  if (_active==true)
+  {
+	if (_tool == 0) 
+	{
 		_brushfilter->SetPoint(px, py, pz);
 		_brushfilter->Run();
-	}
-	if (_tool == 1) {
+	} // _tool 2
+	if (_tool == 1) 
+	{
 		_fillfilter->SetPoint(px, py, pz);
 		_fillfilter->Run();
-	}
+	} // _tool 1
+  } // _active
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetTool(int 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);
-	_imageUndoRedo->SetImage(image);
+void ManualPaintModel::SetImages(vtkImageData *image,vtkImageData *image2) 
+{
+	if (image!=NULL)
+	{
+		_brushfilter -> SetImages(image,image2);
+		_fillfilter  -> SetImages(image,image2);
+		if (image2!=NULL)
+		{
+			_imageUndoRedo->SetImage(image2);
+		} else {
+			_imageUndoRedo->SetImage(image);
+		}
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//		_imageUndoRedo_visited->SetImage( _fillfilter->GetAuxImageFill() );
+	} else {
+		printf("EED Warning image=NULL in ManualPaintModel::SetImage(image)\n ");
+	}
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetGrayLevel(double graylevel) {
+void ManualPaintModel::SetGrayLevel(double graylevel) 
+{
 	_brushfilter->SetGrayLevel(graylevel);
 	_fillfilter->SetGrayLevel(graylevel);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetRangeMin(int min) {
+void ManualPaintModel::SetRangeMin(int min) 
+{
 	_brushfilter->SetRangeMin(min);
 	_fillfilter->SetRangeMin(min);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetRangeMax(int max) {
+void ManualPaintModel::SetRangeMax(int max) 
+{
 	_brushfilter->SetRangeMax(max);
 	_fillfilter->SetRangeMax(max);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDirection(int direction) {
+void ManualPaintModel::SetDirection(int direction) 
+{
 	_brushfilter->SetDirection(direction);
 	_fillfilter->SetDirection(direction);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushSize(int brushsize) {
+void ManualPaintModel::SetBrushSize(int brushsize) 
+{
 	_brushfilter->SetBrushSize(brushsize);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushForm(int brushform) {
+void ManualPaintModel::SetBrushForm(int brushform) 
+{
 	_brushfilter->SetBrushForm(brushform);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetToleranceFill(double tolerancefill) {
+void ManualPaintModel::SetToleranceFill(double tolerancefill) 
+{
 	_fillfilter->SetToleranceFill(tolerancefill);
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDistanceFill(int distancefill) {
+void ManualPaintModel::SetDistanceFill(int distancefill) 
+{
 	_fillfilter->SetDistanceFill(distancefill);
 }
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::GetScalarRange(double * range) {
+void ManualPaintModel::GetScalarRange(double * range) 
+{
 	_fillfilter->GetScalarRange(range);
 }
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetUndoImage() {
+void ManualPaintModel::SetUndoImage() 
+{
 	ImageMManager* imMManager = NULL;
-	if (_tool == 0) {
-		imMManager = this->_brushfilter->GetImageMManager();
-	}
-	if (_tool == 1) {
+	if (_tool == 0) 
+	{
+	 	imMManager = this->_brushfilter->GetImageMManager();
+	} // if 0
+	if (_tool == 1) 
+	{
 		imMManager = this->_fillfilter->GetImageMManager();
-	}
-	this->_imageUndoRedo->SetUndoImage(imMManager);
-	this->_brushfilter->CleanImageMManager();
-	this->_fillfilter->CleanImageMManager();
+	} // if 1
+	this->_imageUndoRedo			-> SetURImages(imMManager);
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	this->_imageUndoRedo_visited	-> SetURImages(imMManager);
+	this->_brushfilter				-> CleanImageMManager();
+	this->_fillfilter				-> CleanImageMManager();
 }
 //---------------------------------------------------------------------------
 
-void ManualPaintModel::Undo() {
+void ManualPaintModel::Undo() 
+{
 	this->_imageUndoRedo->Undo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	this->_imageUndoRedo_visited->Undo();
 }
 
-void ManualPaintModel::Redo() {
+void ManualPaintModel::Redo() 
+{
 	this->_imageUndoRedo->Redo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	this->_imageUndoRedo_visited->Redo();
+}
+
+
+int ManualPaintModel::GetRestorBaseInitialPointX() 
+{
+	return 	this->_imageUndoRedo->GetRestorBaseInitialPointX();
 }
+
+int ManualPaintModel::GetRestorBaseInitialPointY() 
+{
+	return 	this->_imageUndoRedo->GetRestorBaseInitialPointY();
+}
+
+int ManualPaintModel::GetRestorBaseInitialPointZ() 
+{
+	return 	this->_imageUndoRedo->GetRestorBaseInitialPointZ();
+}
+