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=e6c7188787871f4c67c2dc87bb008a99b5d45e27;hpb=5c6b0f79c56a52bb4b7fa4beff359ba99ae3293a;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 e6c7188..415e682 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -1,43 +1,103 @@
+/*# ---------------------------------------------------------------------
+#
+# 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();
-    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);
-    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;
+    bool            _usingAuxImageFill;
+    double          _tmpDistfill;
+	int 			difX;
+	int 			difY;
+	int 			difZ;
+*/
 
-    void    SetAuxImageFill(int px,int py, int pz);
 
 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		;
+
 };