X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.h;h=944cfff590c683697555dcc01232d17afaebdb6f;hb=a8ed15d5eeade921d0b185b04cc6d55be5e57c76;hp=3d9084f3ebf001af50c1eef9b11d96c805cfdeca;hpb=eadde2bf318a6ecd2e38da318069e5fdb0cb7339;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 3d9084f..944cfff 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -1,43 +1,28 @@
-#ifndef _MANUAL_PAINT_MODEL_H_
-#define _MANUAL_PAINT_MODEL_H_
+#ifndef _FILL_FILTER_H_
+#define _FILL_FILTER_H_
 
-#include <vtkImageData.h>
+#include "baseFilterManualPaint.h"
 
-
-class FillFilter  {
+class FillFilter : public baseFilterManualPaint {
 public:
 	FillFilter();
 	virtual ~FillFilter();
 
-    void SetImage(vtkImageData *image);
-    void Set2D3D( int dim2D3D );
-    void SetGrayLevel( double graylevel );
-
-    void FillTool(int px,int py, int pz);
+    void Run();
     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);
+    void SetRangeMin( int min );//DFCH
+    void SetRangeMax( int max );//DFCH
+    int GetRangeMin( ); //DFCH
+    int GetRangeMax( ); //DFCH
+    virtual void SetImage(vtkImageData *image);
 
 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;
@@ -52,8 +37,8 @@ private:
     bool             _auxGrayLevelValidationFill;
     long int        _countProgressingFill;
     long int        _limitRecursionFill;
-
-
+    int    			_RangeMin;
+    int    			_RangeMax;
     void    SetAuxImageFill(int px,int py, int pz);
 
 protected:
@@ -61,4 +46,4 @@ protected:
 };
 
 
-#endif // _MANUAL_PAINT_MODEL_H_
+#endif // _FILL_FILTER_H_