*** 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..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;
 }
-*/
+