X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintModel.h;h=ca60e18b7d807b4cb6a26f6b1ebe31901fe905ca;hb=978a6b69b838cd857d997d53e1392573853ae702;hp=a0d7af85bb833e92894ec112c0ae2731b5d8b6b3;hpb=897b3f6aeec3179a0afed6b1657ed426693c80de;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h
index a0d7af8..ca60e18 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.h
@@ -1,7 +1,8 @@
 #ifndef _MANUAL_PAINT_MODEL_H_
 #define _MANUAL_PAINT_MODEL_H_
 
-#include <vtkImageData.h>
+#include "BrushFilter.h"
+#include "FillFilter.h"
 
 
 class ManualPaintModel  {
@@ -9,57 +10,22 @@ public:
 	ManualPaintModel();
 	virtual ~ManualPaintModel();
 
+    void SetTool( int tool );
+    void Set2D3D( int dim2D3D );
     void SetImage(vtkImageData *image);
-    void PaintImage(int px,int py, int pz);
+    void SetGrayLevel( double graylevel );
+    void SetDirection(int direction);
     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);
-
-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;
-    vtkImageData    *_auxImageFill;
-    bool             _usingAuxImageFill;
-    bool             _auxGrayLevelValidationFill;
-    long int        _countProgressingFill;
-    long int        _limitRecursionFill;
-
+    void PaintImage(int px,int py, int pz);
 
-    void    SetAuxImageFill(int px,int py, int pz);
 
+private:
+    int             _tool;
+    BrushFilter     *_brushfilter;
+    FillFilter      *_fillfilter;
 protected:
 
 };