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=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;hp=3482b2a66e47159810de0a040ad7ade78f730360;hpb=c6fea780dac325eca6315ac9b297080952e53589;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 3482b2a..415e682 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -28,13 +28,20 @@
 
 #include "baseFilterManualPaint.h"
 
+
 class FillFilter : public baseFilterManualPaint {
 public:
 	FillFilter();
 	virtual ~FillFilter();
 
     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);
@@ -45,32 +52,52 @@ private:
     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;
 
+/*
+//EED01
+    int             _pxfill;
+    int             _pyfill;
+    int             _pzfill;
+    long int        _countRecursiveFill;
+    long int        _countRecursiveFillProblem;
+	unsigned char 	*_ptrAuxImageFill;
+    long int        _countProgressingFill;
+    long int        _limitRecursionFill;
+    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		;
+
 };