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=944cfff590c683697555dcc01232d17afaebdb6f;hpb=8efe1d6e29dc7ec7436779b9290b86552df7877f;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 944cfff..bcf22e9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -1,48 +1,90 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef _FILL_FILTER_H_
 #define _FILL_FILTER_H_
 
 #include "baseFilterManualPaint.h"
 
+
 class FillFilter : public baseFilterManualPaint {
 public:
 	FillFilter();
 	virtual ~FillFilter();
+    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();
 
-    void Run();
-    void FillToolRecursive(int px,int py, int pz);
-
-    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);
 
 private:
     double          _tolerancefill;
     int             _distancefill;
-    double          _graylevelbasefill;
-
-    int             _pxfill;
-    int             _pyfill;
-    int             _pzfill;
-    double          _distbasefill;
-    double          _tmpDistfill;
-    double          _tmpiglfill;
-    long int        _countRecursiveFill;
-    long int        _countRecursiveFillProblem;
-    vtkImageData    *_auxImageFill;
-    bool             _usingAuxImageFill;
-    bool             _auxGrayLevelValidationFill;
-    long int        _countProgressingFill;
-    long int        _limitRecursionFill;
-    int    			_RangeMin;
-    int    			_RangeMax;
-    void    SetAuxImageFill(int px,int py, int pz);
+
+//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:
 
+
+
+//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;
+
 };