X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.h;h=03ac7a3a7e6d0a193a1dca961bf03a748b10b6f4;hb=1622b6214967015983b3fb53dabeb599e4c8cda2;hp=9a3e3b8215d7c4c272655538c82c71f86686706a;hpb=f6b647d5bd4c238c85deb7a07950ebe8f296d49d;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 9a3e3b8..03ac7a3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -33,65 +33,38 @@ class FillFilter : public baseFilterManualPaint {
 public:
 	FillFilter();
 	virtual ~FillFilter();
-
     void 			Run();
-    void 			FillToolRecursive(int px,int py, int pz, long int ivi);
-
+	void 			FillToolLoop(int px, int py, int pz,long int iviA) ;
     void 			SetToleranceFill(double tolerancefill);
     void 			SetDistanceFill(int distancefill);
     virtual void 	SetImages(vtkImageData *image,vtkImageData *image2);
-
+	vtkImageData*	GetAuxImageFill();
 private:
     double          _tolerancefill;
     int             _distancefill;
     double          _graylevelbasefill;
-
-    int             _pxfill;
-    int             _pyfill;
-    int             _pzfill;
     double          _distbasefill;
-    double          _tmpDistfill;
     double          _tmpiglfill;
     double          _tmpiglfill2;
-    long int        _countRecursiveFill;
-    long int        _countRecursiveFillProblem;
     vtkImageData    *_auxImageFill;
-//EED01
-	unsigned char 	*_ptrAuxImageFill;
-
-    bool            _usingAuxImageFill;
     bool            _auxGrayLevelValidationFill;
-    long int        _countProgressingFill;
-    long int        _limitRecursionFill;
-
-
-    void    		SetAuxImageFill(int px,int py, int pz,long int ivi);
 	int 			_maxXback;
 	int 			_maxYback;
 	int 			_maxZback;
-
-
-	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		;
+	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		;
-
-
-
+	double 			v_image2;
+	int 			ss_image2;
+	char 			*p_image2;
+	int				st_image2;
 
 };