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=61c234ecf81e25a35e98c59f32b5334b583c13ec;hpb=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;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 61c234e..868583a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -27,11 +27,13 @@
 
 ManualPaintModel::ManualPaintModel() 
 {
-	_active 	= true;
-	_tool 		= 0; // 0 pencil         ,   1 fill
-	_brushfilter 	= new BrushFilter();
-	_fillfilter 	= new FillFilter();
-	_imageUndoRedo 	= new ImageUndoRedo();
+	_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();
 }
 
 //---------------------------------------------------------------------------
@@ -53,13 +55,11 @@ void ManualPaintModel::PaintImage(int px, int py, int pz)
 {
   if (_active==true)
   {
-
 	if (_tool == 0) 
 	{
 		_brushfilter->SetPoint(px, py, pz);
 		_brushfilter->Run();
 	} // _tool 2
-
 	if (_tool == 1) 
 	{
 		_fillfilter->SetPoint(px, py, pz);
@@ -77,8 +77,8 @@ void ManualPaintModel::SetTool(int tool)
 //---------------------------------------------------------------------------
 void ManualPaintModel::Set2D3D(int dim2D3D) 
 {
-	_brushfilter->Set2D3D(dim2D3D);
-	_fillfilter->Set2D3D(dim2D3D);
+	_brushfilter -> Set2D3D(dim2D3D);
+	_fillfilter  -> Set2D3D(dim2D3D);
 }
 
 //---------------------------------------------------------------------------
@@ -88,7 +88,14 @@ void ManualPaintModel::SetImages(vtkImageData *image,vtkImageData *image2)
 	{
 		_brushfilter -> SetImages(image,image2);
 		_fillfilter  -> SetImages(image,image2);
-		_imageUndoRedo->SetImage(image);
+		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 ");
 	}
@@ -155,7 +162,6 @@ void ManualPaintModel::GetScalarRange(double * range)
 //---------------------------------------------------------------------------
 void ManualPaintModel::SetUndoImage() 
 {
-	printf("EED ManualPaintModel::SetUndoImage \n");
 	ImageMManager* imMManager = NULL;
 	if (_tool == 0) 
 	{
@@ -165,19 +171,41 @@ void ManualPaintModel::SetUndoImage()
 	{
 		imMManager = this->_fillfilter->GetImageMManager();
 	} // if 1
-	this->_imageUndoRedo->SetURImages(imMManager);
-	this->_brushfilter->CleanImageMManager();
-	this->_fillfilter->CleanImageMManager();
+	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() 
 {
-	printf("EED ManualPaintModel::Undo \n");
 	this->_imageUndoRedo->Undo();
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	this->_imageUndoRedo_visited->Undo();
 }
 
 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();
+}
+