X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.cpp;h=a7b79aa92c0b7366a726dd474eebbc9614411eea;hb=978a6b69b838cd857d997d53e1392573853ae702;hp=311072df9092989072df2ebd93c003b4f72f33af;hpb=9e00f1118ca3093ed12dd7d49d312b85ae417994;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
index 311072d..a7b79aa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -2,103 +2,24 @@
 #include "BrushFilter.h"
 
 
+
 BrushFilter::BrushFilter()
 {
-    _graylevel          =   0.0;
     _brushsize          =   1;
     _brushform          =   0;      // 0 rectangle-box  ,   1 circle-sphere
-    _2D3D               =   1;      // 0 2D             ,   1 true 3D
     _brushtool          =   0;      // 0 pencil         ,   1 fill
-    _direction          =   0;      // 1 XZ             ,   0 YZ            ,   2 XY
-    _minX               =   0;
-    _minY               =   0;
-    _minZ               =   0;
-    _maxX               =   0;
-    _maxY               =   0;
-    _maxZ               =   0;
-
-    _pMinX              =   0;
-    _pMinY              =   0;
-    _pMinZ              =   0;
-    _pMaxX              =   0;
-    _pMaxY              =   0;
-    _pMaxZ              =   0;
-
-}
-
-//---------------------------------------------------------------------------
-BrushFilter::~BrushFilter()
-{
-}
-
-//---------------------------------------------------------------------------
-void BrushFilter::SetImage(vtkImageData *image)
-{
-    _image=image;
-    int ext[6];
-    _image->GetWholeExtent(ext);
-    _minX=0;
-    _minY=0;
-    _minZ=0;
-    _maxX=ext[1]-ext[0];
-    _maxY=ext[3]-ext[2];
-    _maxZ=ext[5]-ext[4];
-
-}
-
-//---------------------------------------------------------------------------
-void BrushFilter::ResetGeneralMinMax()
-{
-	_pMinX=10000;
-	_pMinY=10000;
-	_pMinZ=10000;
-	_pMaxX=-10000;
-	_pMaxY=-10000;
-	_pMaxZ=-10000;
 }
 
-
 //---------------------------------------------------------------------------
-void BrushFilter::SetGeneralMinMax(int minX,int maxX,int minY,int maxY,int minZ,int maxZ)
+BrushFilter::~BrushFilter()  // virtual
 {
-	if (_pMinX>minX)
-        {
-		_pMinX=minX;
-        }
-
-	if (_pMinY>minY)
-        {
-		_pMinY=minY;
-        }
-
-	if (_pMinZ>minZ)
-        {
-		_pMinZ=minZ;
-        }
-
-	if (_pMaxX<maxX)
-        {
-		_pMaxX=maxX;
-        }
-
-	if (_pMaxY<maxY)
-        {
-		_pMaxY=maxY;
-        }
-
-	if (_pMaxZ<maxZ)
-        {
-		_pMaxZ=maxZ;
-        }
-
 }
 
-
 //---------------------------------------------------------------------------
-void BrushFilter::FindMinMaxBrush(int &minxX,int &maxX,int &minY,int &maxY,int &minZ,int &maxZ,int &size)
+void BrushFilter::FindMinMaxBrush(int &minX,int &maxX,int &minY,int &maxY,int &minZ,int &maxZ,int &size)
 {
         size = _brushsize-1;
-	minX = _px-size;
+        minX = _px-size;
         maxX = _px+size;
         minY = _py-size;
         maxY = _py+size;
@@ -109,18 +30,18 @@ void BrushFilter::FindMinMaxBrush(int &minxX,int &maxX,int &minY,int &maxY,int &
         {
             if (_direction==0)  // YZ
             {
-                minX=px;
-                maxX=px;
+                minX=_px;
+                maxX=_px;
             }
             if (_direction==1) // XZ
             {
-                minY=py;
-                maxY=py;
+                minY=_py;
+                maxY=_py;
             }
             if (_direction==2) // XY
             {
-                minZ=pz;
-                maxZ=pz;
+                minZ=_pz;
+                maxZ=_pz;
             }
         }
 
@@ -165,7 +86,7 @@ void BrushFilter::FindMinMaxBrush(int &minxX,int &maxX,int &minY,int &maxY,int &
 
 
 //---------------------------------------------------------------------------
-void BrushFilter::Run()
+void BrushFilter::Run()  // virtual
 {
     if (_image!=NULL)
     {
@@ -174,23 +95,23 @@ void BrushFilter::Run()
 
 	int size;
         int minX,maxX,minY,maxY,minZ,maxZ;
-        FindMinMaxBrush(minxX,maxX,minY,maxY,minZ,maxZ,size);
+        FindMinMaxBrush(minX,maxX,minY,maxY,minZ,maxZ,size);
 
         double xx,yy,zz,rr=size*size;
 
         for (i=minX; i<=maxX; i++)
         {
-            xx=px-i;
+            xx=_px-i;
             xx=xx*xx;
             for (j=minY; j<=maxY; j++)
             {
-                yy=py-j;
+                yy=_py-j;
                 yy=yy*yy;
                 for (k=minZ; k<=maxZ; k++)
                 {
 //                    if ((i>=_minX) && (i<=_maxX) && (j>=_minY) && (j<=_maxY) && (k>=_minZ) && (k<=_maxZ))
 //                    {
-                        zz=pz-k;
+                        zz=_pz-k;
                         zz=zz*zz;
                         if (_brushform==0)
                         {
@@ -221,12 +142,6 @@ void BrushFilter::SetBrushSize( int brushsize )
     _brushsize = brushsize;
 }
 
-//---------------------------------------------------------------------------
-void BrushFilter::SetGrayLevel( double graylevel )
-{
-    _graylevel = graylevel;
-}
-
 //---------------------------------------------------------------------------
 void BrushFilter::SetBrushForm( int brushform )
 {
@@ -239,24 +154,4 @@ void BrushFilter::SetBrushTool( int brushtool )
     _brushtool = brushtool;
 }
 
-//---------------------------------------------------------------------------
-void BrushFilter::Set2D3D( int dim2D3D )
-{
-    _2D3D = dim2D3D;
-}
-
-//---------------------------------------------------------------------------
-void BrushFilter::SetDirection(int direction)
-{
-    _direction = direction;
-}
-
-//---------------------------------------------------------------------------
-void BrushFilter::Set(int px,int py, int pz)
-{
-    _px=px;
-    _py=py;
-    _pz=pz;
-}
-