X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.h;h=415e682a3bed4b8ce787875a05b399e63118c287;hb=eae1cd9361b2439bc1416453f9ee315112d5bcab;hp=9bf7796b71045241c28b2a7cfcd75786a7addeff;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
index 9bf7796..415e682 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -28,46 +28,76 @@
 
 #include "baseFilterManualPaint.h"
 
+
 class FillFilter : public baseFilterManualPaint {
 public:
 	FillFilter();
 	virtual ~FillFilter();
 
-    void Run();
-    void FillToolRecursive(int px,int py, int pz);
+    void 			Run();
+	void 			FillToolLoop(int px, int py, int pz,long int iviA) ;
+
+/*
+    void 			Run2();
+    void 			FillToolRecursive(int px,int py, int pz, long int ivi);
+    void    		SetAuxImageFill(int px,int py, int pz,long int ivi);
+*/
 
-    void SetToleranceFill(double tolerancefill);
-    void SetDistanceFill(int distancefill);
-    void SetRangeMin( int min );//DFCH
-    void SetRangeMax( int max );//DFCH
-    int GetRangeMin( ); //DFCH
-    int GetRangeMax( ); //DFCH
-    virtual void SetImage(vtkImageData *image);
+    void 			SetToleranceFill(double tolerancefill);
+    void 			SetDistanceFill(int distancefill);
+    virtual void 	SetImages(vtkImageData *image,vtkImageData *image2);
 
 private:
     double          _tolerancefill;
     int             _distancefill;
     double          _graylevelbasefill;
 
+    double          _distbasefill;
+    double          _tmpiglfill;
+    double          _tmpiglfill2;
+    vtkImageData    *_auxImageFill;
+
+    bool            _auxGrayLevelValidationFill;
+
+
+	int 			_maxXback;
+	int 			_maxYback;
+	int 			_maxZback;
+
+/*
+//EED01
     int             _pxfill;
     int             _pyfill;
     int             _pzfill;
-    double          _distbasefill;
-    double          _tmpDistfill;
-    double          _tmpiglfill;
     long int        _countRecursiveFill;
     long int        _countRecursiveFillProblem;
-    vtkImageData    *_auxImageFill;
-    bool             _usingAuxImageFill;
-    bool             _auxGrayLevelValidationFill;
+	unsigned char 	*_ptrAuxImageFill;
     long int        _countProgressingFill;
     long int        _limitRecursionFill;
-    int    			_RangeMin;
-    int    			_RangeMax;
-    void    SetAuxImageFill(int px,int py, int pz);
+    bool            _usingAuxImageFill;
+    double          _tmpDistfill;
+	int 			difX;
+	int 			difY;
+	int 			difZ;
+*/
+
 
 protected:
 
+
+//DEF_POINTER_IMAGE_VTK_CREA_definition( v_image , ss_image , p_image , st_image )		
+	double 	v_image			;
+	int 	ss_image 		;
+	char 	*p_image 		;
+	int		st_image		;
+
+//macro not working ???    
+//   DEF_POINTER_IMAGE_VTK_CREA_definition(v_image2,ss_image2,p_image2,st_image2)		
+	double 	v_image2		;
+	int 	ss_image2 		;
+	char 	*p_image2 		;
+	int		st_image2		;
+
 };