X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintModel.h;h=a99749abce977d42e0d357ededac2dad877b3b07;hb=f9901e756bb82bd333310b47607875331616bb29;hp=8ec61e2491b010c91c0e9d6490d2e84f393d2ea1;hpb=2c09a61fc7d7695eebf8ca886fb8cd727afccc09;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h
index 8ec61e2..a99749a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h
@@ -29,22 +29,17 @@
 #include "BrushFilter.h"
 #include "FillFilter.h"
 
-//#include "regionStructUR.h"
-//#include "imageUndoRedo.h"
-
 #include "imageModificationManager.h"
 #include "imageUndoRedo.h"
 
-
 class ManualPaintModel {
 public:
 	ManualPaintModel();
 	virtual ~ManualPaintModel();
-
 	void SetActive(bool active);
 	void SetTool(int tool);
 	void Set2D3D(int dim2D3D);
-	void SetImage(vtkImageData *image);
+	void SetImages(vtkImageData *image,vtkImageData *image2);
 	void SetGrayLevel(double graylevel);
 	void SetDirection(int direction);
 	void SetBrushSize(int brushsize);
@@ -55,19 +50,22 @@ public:
 	void SetRangeMin(int min);
 	void SetRangeMax(int max);
 	void GetScalarRange(double * range);
-	void SetUndoImage(); //DFCH
-	void Undo(); //DFCH
-	void Redo(); //DFCH
+	void SetUndoImage(); 	//DFCH
+	void Undo(); 			//DFCH
+	void Redo(); 			//DFCH
 
-private:
-	int _tool;
-	bool _active;
-	BrushFilter *_brushfilter;
-	FillFilter *_fillfilter;
-	ImageUndoRedo *_imageUndoRedo;
+	int GetRestorBaseInitialPointX();
+	int GetRestorBaseInitialPointY();
+	int GetRestorBaseInitialPointZ();
 
+private:
+	int 			_tool;
+	bool 			_active;
+	BrushFilter 	*_brushfilter;
+	FillFilter 		*_fillfilter;
+	ImageUndoRedo 	*_imageUndoRedo;
+	ImageUndoRedo 	*_imageUndoRedo_visited;
 protected:
-
 };
 
 #endif // _MANUAL_PAINT_MODEL_H_