X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.h;h=86f94e27ac8771590b077329828a6ce55a859ea4;hb=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=03af3fae43c118271011a340f90aa5b7d16f2638;hpb=9e00f1118ca3093ed12dd7d49d312b85ae417994;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
index 03af3fa..86f94e2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
@@ -1,71 +1,32 @@
 #ifndef _BRUSH_FILTER_H_
 #define _BRUSH_FILTER_H_
 
-#include <vtkImageData.h>
+#include "baseFilterManualPaint.h"
 
-
-class BrushFilter  {
+class BrushFilter : public  baseFilterManualPaint {
 public:
 	BrushFilter();
 	virtual ~BrushFilter();
 
-    void SetImage(vtkImageData *image);
-    void SetPoint(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 SetDirection(int direction);
+    void SetRangeMin( int min );//DFCH
+    void SetRangeMax( int max );//DFCH
+    int GetRangeMin( ); //DFCH
+    int GetRangeMax( ); //DFCH
     void FindMinMaxBrush(int &minxX,int &maxX,int &minY,int &maxY,int &minZ,int &maxZ,int &size);
-    void ResetGeneralMinMax();
-    void SetGeneralMinMax(int minX,int maxX,int minY,int maxY,int minZ,int maxZ);
-    void Run();
+    virtual void Run();
 
 
 private:
-    vtkImageData    *_image;
-    int 	    _px;    // start point of the brush
-    int 	    _py;
-    int 	    _pz;
-    int 	    _pMinX;  // General min max of many brush actions
-    int 	    _pMinY;
-    int 	    _pMinZ;
-    int 	    _pMaxX;
-    int 	    _pMaxY;
-    int 	    _pMaxZ;
-    int             _minX;   // min max of the image
-    int             _maxX;
-    int             _minY;
-    int             _maxY;
-    int             _minZ;
-    int             _maxZ;
     int             _brushsize;
     int             _brushform;
     int             _brushtool;
-    bool            _2D3D;
-    double          _graylevel;
+    int    			_RangeMin;
+    int    			_RangeMax;
 
 
-// EED Borrame
-//    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;
-//    vtkImageData    *_auxImageFill;
-//    bool             _usingAuxImageFill;
-//    bool             _auxGrayLevelValidationFill;
-//    long int        _countProgressingFill;
-//    long int        _limitRecursionFill;
-//    void    SetAuxImageFill(int px,int py, int pz);
 
 protected: