*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / FillFilter.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
index a94e39fbb2e5760be22b93c69059219546cee2e4..d88e1b157560546dade5592473e98993075f3d03 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -1,29 +1,17 @@
-/*
-#include "ManualPaintModel.h"
 
+#include "FillFilter.h"
 
-ManualPaintModel::ManualPaintModel()
+
+FillFilter::FillFilter()
 {
-    _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
     _tolerancefill      =   50;
     _distancefill       =   500;
     _limitRecursionFill =   100000;
-    _minX               =   0;
-    _minY               =   0;
-    _minZ               =   0;
-    _maxX               =   0;
-    _maxY               =   0;
-    _maxZ               =   0;
     _auxImageFill       =   NULL;
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel()
+FillFilter::~FillFilter()
 {
     if (_auxImageFill!=NULL)
     {
@@ -32,20 +20,9 @@ ManualPaintModel::~ManualPaintModel()
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetImage(vtkImageData *image)
+void FillFilter::SetImage(vtkImageData *image) // virtual
 {
-    _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];
-
-
+    baseFilterManualPaint::SetImage(image);
     if (_auxImageFill!=NULL)
     {
         _auxImageFill->Delete();
@@ -57,32 +34,18 @@ void ManualPaintModel::SetImage(vtkImageData *image)
        _auxImageFill->SetWholeExtent( 0 , _maxX , 0 , _maxY , 0, _maxZ );
        _auxImageFill->SetScalarTypeToUnsignedChar();
        _auxImageFill->AllocateScalars();
-
-}
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::PaintImage(int px,int py, int pz)
-{
-    if (_brushtool==0)
-    {
-        BrushTool(px,py,pz);
-    }
-    if (_brushtool==1)
-    {
-        FillTool(px,py,pz);
-    }
 }
 
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::FillTool(int px,int py, int pz)
+void FillFilter::Run() // virtual
 {
-    if ((px>=_minX) && (px<=_maxX) && (py>=_minY) && (py<=_maxY) && (pz>=_minZ) && (pz<=_maxZ))
+    if ((_px>=_minX) && (_px<=_maxX) && (_py>=_minY) && (_py<=_maxY) && (_pz>=_minZ) && (_pz<=_maxZ))
     {
-        _graylevelbasefill          = _image->GetScalarComponentAsDouble(px,py,pz, 0);
-        _pxfill                     = px;
-        _pyfill                     = py;
-        _pzfill                     = pz;
+        _graylevelbasefill          = _image->GetScalarComponentAsDouble(_px,_py,_pz, 0);
+        _pxfill                     = _px;
+        _pyfill                     = _py;
+        _pzfill                     = _pz;
         _distbasefill               = _distancefill*_distancefill;
         _countRecursiveFill         = 0;
         _countRecursiveFillProblem  = 0;
@@ -91,7 +54,7 @@ void ManualPaintModel::FillTool(int px,int py, int pz)
         _usingAuxImageFill=false;
         memset ( pImage , 0 , _maxX*_maxY*_maxZ );
 
-        FillToolRecursive(px,py,pz);
+        FillToolRecursive(_px,_py,_pz);
         printf("--\n");
 
         int ii,jj,kk;
@@ -121,7 +84,7 @@ void ManualPaintModel::FillTool(int px,int py, int pz)
 
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::FillToolRecursive(int px,int py, int pz)
+void FillFilter::FillToolRecursive(int px,int py, int pz)
 {
     _countRecursiveFill++;
 
@@ -252,7 +215,7 @@ void ManualPaintModel::FillToolRecursive(int px,int py, int pz)
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetAuxImageFill(int px,int py, int pz)
+void FillFilter::SetAuxImageFill(int px,int py, int pz)
 {
     if ((px>=_minX) && (px<=_maxX) && (py>=_minY) && (py<=_maxY) && (pz>=_minZ) && (pz<=_maxZ))
     {
@@ -260,130 +223,17 @@ void ManualPaintModel::SetAuxImageFill(int px,int py, int pz)
     }
 }
 
-//---------------------------------------------------------------------------
-void ManualPaintModel::BrushTool(int px,int py, int pz)
-{
-    if (_image!=NULL)
-    {
-        float value=(float)_graylevel;
-        int i,j,k;
-        int size = _brushsize-1;
-
-        int minX = px-size;
-        int maxX = px+size;
-        int minY = py-size;
-        int maxY = py+size;
-        int minZ = pz-size;
-        int maxZ = pz+size;
-
-        if (_2D3D==0) //2D
-        {
-            if (_direction==0)  // YZ
-            {
-                minX=px;
-                maxX=px;
-            }
-            if (_direction==1) // XZ
-            {
-                minY=py;
-                maxY=py;
-            }
-            if (_direction==2) // XY
-            {
-                minZ=pz;
-                maxZ=pz;
-            }
-        }
-
-        if (_2D3D==1) // 3D
-        {
-        }
-
-
-        double xx,yy,zz,rr=size*size;
-
-        for (i=minX; i<=maxX; i++)
-        {
-            xx=px-i;
-            xx=xx*xx;
-            for (j=minY; j<=maxY; 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=zz*zz;
-                        if (_brushform==0)
-                        {
-                            _image->SetScalarComponentFromFloat (i,j,k, 0, value );
-                        } else if (_brushform==1)
-                        {
-                            if ((xx+yy+zz)<=rr)
-                            {
-                                _image->SetScalarComponentFromFloat (i,j,k, 0, value );
-                            }
-                        } // _brushform
-
-                    } //if _minX _maxX _minY _maxY _minZ _maxZ
-
-                }//k
-            }//j
-        }//i
-        _image->Modified();
-    } else  {
-        printf("ERROR : bbcreaMaracasvisu::vtkInteractorManualPaint::PaintImage :  Image not set. \n");
-    } // _image
-}
-
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushSize( int brushsize )
-{
-    _brushsize = brushsize;
-}
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetGrayLevel( double graylevel )
-{
-    _graylevel = graylevel;
-}
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushForm( int brushform )
-{
-    _brushform = brushform;
-}
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushTool( int brushtool )
-{
-    _brushtool = brushtool;
-}
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::Set2D3D( int dim2D3D )
-{
-    _2D3D = dim2D3D;
-}
-
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetToleranceFill(double tolerancefill)
+void FillFilter::SetToleranceFill(double tolerancefill)
 {
     _tolerancefill = tolerancefill;
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetDistanceFill(int distancefill)
+void FillFilter::SetDistanceFill(int distancefill)
 {
     _distancefill = distancefill;
 }
 
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetDirection(int direction)
-{
-    _direction = direction;
-}
-*/
+