*** empty log message ***

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
index 642e656439868396b62ef2453ee3c825c5a7fff1..79b39f5855ae1a154627c7ab1ade9eb39933137e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -1,4 +1,3 @@
-/*
 
 #include "BrushFilter.h"
 
@@ -96,10 +95,10 @@ void BrushFilter::SetGeneralMinMax(int minX,int maxX,int minY,int maxY,int minZ,
 
 
 //---------------------------------------------------------------------------
-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;
@@ -110,18 +109,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;
             }
         }
 
@@ -175,23 +174,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)
                         {
@@ -253,11 +252,11 @@ void BrushFilter::SetDirection(int direction)
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::Set(int px,int py, int pz)
+void BrushFilter::SetPoint(int px,int py, int pz)
 {
     _px=px;
     _py=py;
     _pz=pz;
 }
 
-*/
+

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
index 03af3fae43c118271011a340f90aa5b7d16f2638..1ee180ef26555b464bb1e5a50c9e5042272f6a73 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.h
@@ -25,15 +25,16 @@ public:
 
 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             _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;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
index a94e39fbb2e5760be22b93c69059219546cee2e4..edb4effb6cd30679f7beebbb4e9819581018afe1 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -1,14 +1,11 @@
-/*
-#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;
@@ -23,7 +20,7 @@ ManualPaintModel::ManualPaintModel()
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel()
+FillFilter::~FillFilter()
 {
     if (_auxImageFill!=NULL)
     {
@@ -32,7 +29,7 @@ ManualPaintModel::~ManualPaintModel()
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetImage(vtkImageData *image)
+void FillFilter::SetImage(vtkImageData *image)
 {
     _image=image;
 
@@ -61,21 +58,7 @@ void ManualPaintModel::SetImage(vtkImageData *image)
 }
 
 //---------------------------------------------------------------------------
-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::FillTool(int px,int py, int pz)
 {
     if ((px>=_minX) && (px<=_maxX) && (py>=_minY) && (py<=_maxY) && (pz>=_minZ) && (pz<=_maxZ))
     {
@@ -121,7 +104,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 +235,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))
     {
@@ -261,7 +244,7 @@ void ManualPaintModel::SetAuxImageFill(int px,int py, int pz)
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::BrushTool(int px,int py, int pz)
+void FillFilter::BrushTool(int px,int py, int pz)
 {
     if (_image!=NULL)
     {
@@ -339,51 +322,36 @@ void ManualPaintModel::BrushTool(int px,int py, int pz)
 }
 
 
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushSize( int brushsize )
-{
-    _brushsize = brushsize;
-}
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::SetGrayLevel( double graylevel )
+void FillFilter::SetGrayLevel( double graylevel )
 {
     _graylevel = graylevel;
 }
 
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushForm( int brushform )
-{
-    _brushform = brushform;
-}
 
-//---------------------------------------------------------------------------
-void ManualPaintModel::SetBrushTool( int brushtool )
-{
-    _brushtool = brushtool;
-}
 
 //---------------------------------------------------------------------------
-void ManualPaintModel::Set2D3D( int dim2D3D )
+void FillFilter::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)
+void FillFilter::SetDirection(int direction)
 {
     _direction = direction;
 }
-*/
+

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
index a0d7af85bb833e92894ec112c0ae2731b5d8b6b3..3d9084f3ebf001af50c1eef9b11d96c805cfdeca 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -4,16 +4,12 @@
 #include <vtkImageData.h>
 
 
-class ManualPaintModel  {
+class FillFilter  {
 public:
-       ManualPaintModel();
-       virtual ~ManualPaintModel();
+       FillFilter();
+       virtual ~FillFilter();
 
     void SetImage(vtkImageData *image);
-    void PaintImage(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 );