X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.h;h=03ac7a3a7e6d0a193a1dca961bf03a748b10b6f4;hb=1622b6214967015983b3fb53dabeb599e4c8cda2;hp=a0d7af85bb833e92894ec112c0ae2731b5d8b6b3;hpb=9e00f1118ca3093ed12dd7d49d312b85ae417994;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 a0d7af8..03ac7a3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -1,68 +1,72 @@
-#ifndef _MANUAL_PAINT_MODEL_H_
-#define _MANUAL_PAINT_MODEL_H_
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
 
-#include <vtkImageData.h>
+#ifndef _FILL_FILTER_H_
+#define _FILL_FILTER_H_
 
+#include "baseFilterManualPaint.h"
 
-class ManualPaintModel  {
-public:
-	ManualPaintModel();
-	virtual ~ManualPaintModel();
-
-    void SetImage(vtkImageData *image);
-    void PaintImage(int px,int py, int pz);
-    void SetBrushSize( int brushsize );
-    void SetBrushForm( int brushform );
-    void SetBrushTool( int brushtool );
-    void Set2D3D( int dim2D3D );
-    void SetGrayLevel( double graylevel );
-
-    void FillTool(int px,int py, int pz);
-    void FillToolRecursive(int px,int py, int pz);
-
-    void BrushTool(int px,int py, int pz);
-    void SetToleranceFill(double tolerancefill);
-    void SetDistanceFill(int distancefill);
-    void SetDirection(int direction);
 
+class FillFilter : public baseFilterManualPaint {
+public:
+	FillFilter();
+	virtual ~FillFilter();
+    void 			Run();
+	void 			FillToolLoop(int px, int py, int pz,long int iviA) ;
+    void 			SetToleranceFill(double tolerancefill);
+    void 			SetDistanceFill(int distancefill);
+    virtual void 	SetImages(vtkImageData *image,vtkImageData *image2);
+	vtkImageData*	GetAuxImageFill();
 private:
-    vtkImageData    *_image;
-    int             _minX;
-    int             _maxX;
-    int             _minY;
-    int             _maxY;
-    int             _minZ;
-    int             _maxZ;
-    int             _brushsize;
-    int             _brushform;
-    int             _brushtool;
-    bool            _2D3D;
-    double          _graylevel;
     double          _tolerancefill;
     int             _distancefill;
     double          _graylevelbasefill;
-    int             _direction;
-
-    int             _pxfill;
-    int             _pyfill;
-    int             _pzfill;
     double          _distbasefill;
-    double          _tmpDistfill;
     double          _tmpiglfill;
-    long int        _countRecursiveFill;
-    long int        _countRecursiveFillProblem;
+    double          _tmpiglfill2;
     vtkImageData    *_auxImageFill;
-    bool             _usingAuxImageFill;
-    bool             _auxGrayLevelValidationFill;
-    long int        _countProgressingFill;
-    long int        _limitRecursionFill;
-
+    bool            _auxGrayLevelValidationFill;
+	int 			_maxXback;
+	int 			_maxYback;
+	int 			_maxZback;
+protected:
 
-    void    SetAuxImageFill(int px,int py, int pz);
+//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;
 
-protected:
+//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;
 
 };
 
 
-#endif // _MANUAL_PAINT_MODEL_H_
+#endif // _FILL_FILTER_H_