X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.h;h=dc118a8eab717ed996cdc219a01bd3fdbe86c00e;hb=7d08401d8ffee17aaf47ff6ee83161cbaa1f10b9;hp=4b0d29b73d519afa994d20532359acdc6baf0314;hpb=1e74c6a806cb7f396fd6c5016c6803c391c466d7;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 4b0d29b..dc118a8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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_
 
@@ -8,16 +33,12 @@ public:
 	FillFilter();
 	virtual ~FillFilter();
 
-    void Run();
-    void FillToolRecursive(int px,int py, int pz);
+    void 			Run();
+    void 			FillToolRecursive(int px,int py, int pz);
 
-    void SetToleranceFill(double tolerancefill);
-    void SetDistanceFill(int distancefill);
-    void SetRangeMin( unsigned int min );//DFCH
-    void SetRangeMax( unsigned int max );//DFCH
-    unsigned int GetRangeMin( ); //DFCH
-    unsigned int GetRangeMax( ); //DFCH
-    virtual void SetImage(vtkImageData *image);
+    void 			SetToleranceFill(double tolerancefill);
+    void 			SetDistanceFill(int distancefill);
+    virtual void 	SetImages(vtkImageData *image,vtkImageData *image2);
 
 private:
     double          _tolerancefill;
@@ -30,16 +51,17 @@ private:
     double          _distbasefill;
     double          _tmpDistfill;
     double          _tmpiglfill;
+    double          _tmpiglfill2;
     long int        _countRecursiveFill;
     long int        _countRecursiveFillProblem;
     vtkImageData    *_auxImageFill;
-    bool             _usingAuxImageFill;
-    bool             _auxGrayLevelValidationFill;
+    bool            _usingAuxImageFill;
+    bool            _auxGrayLevelValidationFill;
     long int        _countProgressingFill;
     long int        _limitRecursionFill;
-    unsigned int    _RangeMin;
-    unsigned int    _RangeMax;
-    void    SetAuxImageFill(int px,int py, int pz);
+
+
+    void    		SetAuxImageFill(int px,int py, int pz);
 
 protected: