X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.h;h=3e35c343b3c6b924a442195b8bd85bc85b916c3c;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=1ee180ef26555b464bb1e5a50c9e5042272f6a73;hpb=eadde2bf318a6ecd2e38da318069e5fdb0cb7339;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 1ee180e..3e35c34 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
@@ -1,72 +1,50 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 _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 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             _direction;
-    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;
-
 
-// 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: