X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.h;h=bcf22e92ef0d329728f03e36cca315d5bc484608;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=415e682a3bed4b8ce787875a05b399e63118c287;hpb=874205e7c7c6744db73d30756b6e7a1c47122a29;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 415e682..bcf22e9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -33,70 +33,57 @@ 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 			Run(int px, int py, int pz);
+	void 			FillToolLoop(int px, int py, int pz);
     void 			SetToleranceFill(double tolerancefill);
     void 			SetDistanceFill(int distancefill);
     virtual void 	SetImages(vtkImageData *image,vtkImageData *image2);
+//	vtkImageData*	GetAuxImageFill();
+void 			Copy_GeneralAuxFill_to_Results();
+
 
 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;
-    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;
-*/
+
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//    double          _distbasefill;
+//    double          _graylevelbasefill;
+//    double          _tmpiglfill;
+//    double          _tmpiglfill2;
+//    bool            _auxGrayLevelValidationFill;
+
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//   vtkImageData    *_auxImageFill;
+//	int 			_maxXback;
+//	int 			_maxYback;
+//	int 			_maxZback;
+   vtkImageData    *_GeneralAuxImageFill;
+
+vtkImageData* 	CreateAuxImageFill(	long int &OneColumnAux, long int &OneLineAux , long int &OnePlaneAux, 
+									int px,			int py,			int pz, 
+									int &pxAux, 	int &pyAux, 	int &pzAux, 
+									int &minXAux,	int &minYAux, 	int &minZAux   );
+void 			Copy_AuxImageFill_To_GeneralAuxFill(int minXAux, int minYAux, int minZAux, vtkImageData *auxImageFill);
 
 
 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		;
+//Change to local variables to use with openmp
+// 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;
 
 };