X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FbaseFilterManualPaint.h;h=bdb76a4df51871292a97d724b5083440f48cbb68;hb=86048e9a60b41a8e2dcc1f7554835d16e74f2b2e;hp=32319a5a3eee1e3caa981125306278dca511f920;hpb=f21fba620841086c95c71e58d1b4bbcf67ba3548;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
index 32319a5..bdb76a4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
@@ -39,15 +39,20 @@ public:
 	baseFilterManualPaint();
 	virtual ~baseFilterManualPaint();
 
-	virtual void SetImage(vtkImageData *image);
+	virtual void SetImages(vtkImageData *image,vtkImageData *image2);
 	void SetPoint(int px, int py, int pz);
 	void Set2D3D(int dim2D3D);
 	void SetGrayLevel(double graylevel);
 	void SetDirection(int direction);
 	void ResetGeneralMinMax();
-	void SetGeneralMinMax(int minX, int maxX, int minY, int maxY, int minZ,
-			int maxZ);
+	void SetGeneralMinMax(int minX, int maxX, int minY, int maxY, int minZ, int maxZ);
 	void GetScalarRange(double * range);
+
+    void SetRangeMin( int min );//DFCH
+    void SetRangeMax( int max );//DFCH
+    int GetRangeMin( ); //DFCH
+    int GetRangeMax( ); //DFCH
+
 	ImageMManager* GetImageMManager(); //DFCH
 	void CleanImageMManager(); //DFCH
 	virtual void Run();
@@ -55,26 +60,31 @@ public:
 private:
 
 protected:
-	ImageMManager *_IMManager; //Saves the last modified region (MinX, MaxX, MinY, MaxY, MinZ, MaxZ).
-	vtkImageData *_image;
-	int _direction;
-	int _px; // start point of the brush
-	int _py;
-	int _pz;
-	int _pMinX; // General min max of many brush actions
-	int _pMinY;
-	int _pMinZ;
-	int _pMaxX;
-	int _pMaxY;
-	int _pMaxZ;
-	int _minX; // min max of the image
-	int _maxX;
-	int _minY;
-	int _maxY;
-	int _minZ;
-	int _maxZ;
-	bool _2D3D;
-	double _graylevel;
+	ImageMManager 	*_IMManager; //Saves the last modified region (MinX, MaxX, MinY, MaxY, MinZ, MaxZ).
+	vtkImageData 	*_image;
+	vtkImageData 	*_image2;
+	int 			_direction;
+	int 			_px; // start point of the brush
+	int 			_py;
+	int 			_pz;
+	int 			_pMinX; // General min max of many brush actions
+	int 			_pMinY;
+	int 			_pMinZ;
+	int 			_pMaxX;
+	int 			_pMaxY;
+	int 			_pMaxZ;
+	int 			_minX; // min max of the image
+	int 			_maxX;
+	int 			_minY;
+	int 			_maxY;
+	int 			_minZ;
+	int 			_maxZ;
+	bool 			_2D3D;
+	double 			_graylevel;
+    int    			_RangeMin;
+    int    			_RangeMax;
+
+
 };
 
 #endif // _BASE_FILTER_MANUAL_PAINT_H_