X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.cpp;h=02a5130c17546f2dedfaa6be6211588771243bec;hb=07c470d8eed4bd0b96f829c7dc9f63cc5d714869;hp=a94e39fbb2e5760be22b93c69059219546cee2e4;hpb=3de3a1d277802c36213ed1b5e66d72e22b566421;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp index a94e39f..02a5130 100644 --- 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; + _limitRecursionFill = 50000; _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++; @@ -141,10 +104,48 @@ void ManualPaintModel::FillToolRecursive(int px,int py, int pz) _tmpDistfill=(px-_pxfill)*(px-_pxfill) + (py-_pyfill)*(py-_pyfill) + (pz-_pzfill)*(pz-_pzfill); _tmpiglfill=_image->GetScalarComponentAsDouble(px,py,pz, 0); - _auxGrayLevelValidationFill = (_tmpiglfill!=_graylevel) && + float grayLBFMTOL = _graylevelbasefill-_tolerancefill; + float grayLBFPTOL = _graylevelbasefill+_tolerancefill; + bool isInRange = false; + //DFCH + if( _RangeMin <= grayLBFMTOL && _RangeMax >= grayLBFPTOL ) + { + isInRange = true; + }//fi esle + else if( _RangeMin > grayLBFMTOL && _RangeMax >= grayLBFPTOL ) + { + grayLBFMTOL = _RangeMin; + isInRange = true; + }//fi esle + else if( _RangeMin <= grayLBFMTOL && _RangeMax < grayLBFPTOL ) + { + grayLBFPTOL = _RangeMax; + isInRange = true; + }//fi esle + else if( ( _RangeMin <= _graylevelbasefill ) && ( _graylevelbasefill <= _RangeMax ) ) + { + grayLBFMTOL = _RangeMin; + grayLBFPTOL = _RangeMax; + isInRange = true; + }//fi esle + + if( isInRange ) + { + _auxGrayLevelValidationFill = (_tmpiglfill!=_graylevel) && + (_tmpiglfill>=grayLBFMTOL) && + (_tmpiglfill<=grayLBFPTOL) && + (_tmpDistfill<=_distbasefill); //DFCH + }//fi + else + { + _auxGrayLevelValidationFill = false; + }//esle + //DFCH + /*_auxGrayLevelValidationFill = (_tmpiglfill!=_graylevel) && (_tmpiglfill>=_graylevelbasefill-_tolerancefill) && (_tmpiglfill<=_graylevelbasefill+_tolerancefill) && - (_tmpDistfill<=_distbasefill); + (_tmpDistfill<=_distbasefill);*/ //DFCH + if ( _auxGrayLevelValidationFill==true ) { @@ -252,7 +253,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 +261,39 @@ 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 ) +void FillFilter::SetToleranceFill(double tolerancefill) { - _brushform = brushform; + _tolerancefill = tolerancefill; } //--------------------------------------------------------------------------- -void ManualPaintModel::SetBrushTool( int brushtool ) +void FillFilter::SetDistanceFill(int distancefill) { - _brushtool = brushtool; + _distancefill = distancefill; } //--------------------------------------------------------------------------- -void ManualPaintModel::Set2D3D( int dim2D3D ) +void FillFilter::SetRangeMin( int min ) { - _2D3D = dim2D3D; + _RangeMin = min; } //--------------------------------------------------------------------------- -void ManualPaintModel::SetToleranceFill(double tolerancefill) +void FillFilter::SetRangeMax( int max ) { - _tolerancefill = tolerancefill; + _RangeMax = max; } //--------------------------------------------------------------------------- -void ManualPaintModel::SetDistanceFill(int distancefill) +int FillFilter::GetRangeMin( ) { - _distancefill = distancefill; + return( _RangeMin ); } //--------------------------------------------------------------------------- -void ManualPaintModel::SetDirection(int direction) +int FillFilter::GetRangeMax( ) { - _direction = direction; + return( _RangeMax ); } -*/