X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.cpp;h=785cdd7171b49cfe591aeb05f5312f905c22c3dc;hb=0cc1383dff9255c9929097bbe9f44a6f4f31c97a;hp=e5371b77ad8d9342e23e44c4392f864b267bc8e6;hpb=5c6b0f79c56a52bb4b7fa4beff359ba99ae3293a;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 e5371b7..785cdd7 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp @@ -1,281 +1,165 @@ - #include "BrushFilter.h" -baseFilterManualPaint::baseFilterManualPaint() -{ - _graylevel = 0.0; - _2D3D = 1; // 0 2D , 1 true 3D - _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() { + _brushsize = 1; + _brushform = 0; // 0 rectangle-box , 1 circle-sphere + _brushtool = 0; // 0 pencil , 1 fill } //--------------------------------------------------------------------------- -baseFilterManualPaint::~baseFilterManualPaint() // virtual +BrushFilter::~BrushFilter() // virtual { } //--------------------------------------------------------------------------- -void baseFilterManualPaint::Run() // virtual -{ -} +void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY, + int &minZ, int &maxZ, int &size) { + size = _brushsize - 1; + minX = _px - size; + maxX = _px + size; + minY = _py - size; + maxY = _py + size; + minZ = _pz - size; + 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; + } + } -//--------------------------------------------------------------------------- -void baseFilterManualPaint::SetGrayLevel( double graylevel ) -{ - _graylevel = graylevel; -} + if (_2D3D == 1) // 3D + { + } -//--------------------------------------------------------------------------- -void baseFilterManualPaint::Set2D3D( int dim2D3D ) -{ - _2D3D = dim2D3D; -} + if (minX < _minX) { + minX = _minX; + } -//--------------------------------------------------------------------------- -void baseFilterManualPaint::SetDirection(int direction) -{ - _direction = direction; -} + if (minY < _minY) { + minY = _minY; + } -//--------------------------------------------------------------------------- -void baseFilterManualPaint::SetPoint(int px,int py, int pz) -{ - _px=px; - _py=py; - _pz=pz; -} + if (minZ < _minZ) { + minZ = _minZ; + } -//--------------------------------------------------------------------------- -void baseFilterManualPaint::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]; -} + if (maxX > _maxX) { + maxX = _maxX; + } -//--------------------------------------------------------------------------- -void baseFilterManualPaint::ResetGeneralMinMax() -{ - _pMinX=10000; - _pMinY=10000; - _pMinZ=10000; - _pMaxX=-10000; - _pMaxY=-10000; - _pMaxZ=-10000; -} + if (maxY > _maxY) { + maxY = _maxY; + } + + if (maxZ > _maxZ) { + maxZ = _maxZ; + } + //-- + SetGeneralMinMax(minX, maxX, minY, maxY, minZ, maxZ); +} //--------------------------------------------------------------------------- -void baseFilterManualPaint::SetGeneralMinMax(int minX,int maxX,int minY,int maxY,int minZ,int maxZ) +void BrushFilter::Run() // virtual { - if (_pMinX>minX) - { - _pMinX=minX; - } + if (_image != NULL) + { + float value = (float) _graylevel; + int i, j, k; - if (_pMinY>minY) - { - _pMinY=minY; - } + int size; + int minX, maxX, minY, maxY, minZ, maxZ; + FindMinMaxBrush(minX, maxX, minY, maxY, minZ, maxZ, size); - if (_pMinZ>minZ) - { - _pMinZ=minZ; - } + double xx, yy, zz, rr = size * size; - if (_pMaxX=_minX) && (i<=_maxX) && (j>=_minY) && (j<=_maxY) && (k>=_minZ) && (k<=_maxZ)) +// { - if (_pMaxYGetScalarComponentAsFloat(i, + j, k, 0); + if ((this->GetRangeMin() <= scalarComponent) + && (scalarComponent <= this->GetRangeMax())) { + zz = _pz - k; + zz = zz * zz; + if (_brushform == 0) { + this->_IMManager->AddModifiedPixel(i, j, k); //DFCH + _image->SetScalarComponentFromFloat(i, j, k, 0, + value); + } else if (_brushform == 1) { + if ((xx + yy + zz) <= rr) { + this->_IMManager->AddModifiedPixel(i, j, k); //DFCH + _image->SetScalarComponentFromFloat(i, j, k, 0, + value); + } + } // _brushform + } // GetRangeMin && GetRangeMax - if (_pMaxZModified(); + } else { + printf( + "ERROR : bbcreaMaracasvisu::vtkInteractorManualPaint::PaintImage : Image not set. \n"); + } // _image } - - -//--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- - - -BrushFilter::BrushFilter() -{ - _brushsize = 1; - _brushform = 0; // 0 rectangle-box , 1 circle-sphere - _brushtool = 0; // 0 pencil , 1 fill +void BrushFilter::SetBrushSize(int brushsize) { + _brushsize = brushsize; } //--------------------------------------------------------------------------- -BrushFilter::~BrushFilter() // virtual -{ +void BrushFilter::SetBrushForm(int brushform) { + _brushform = brushform; } //--------------------------------------------------------------------------- -void BrushFilter::FindMinMaxBrush(int &minX,int &maxX,int &minY,int &maxY,int &minZ,int &maxZ,int &size) -{ - size = _brushsize-1; - minX = _px-size; - maxX = _px+size; - minY = _py-size; - maxY = _py+size; - minZ = _pz-size; - 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 - { - } - - if (minX<_minX) - { - minX=_minX; - } - - if (minY<_minY) - { - minY=_minY; - } - - if (minZ<_minZ) - { - minZ=_minZ; - } - - if (maxX>_maxX) - { - maxX=_maxX; - } - - if (maxY>_maxY) - { - maxY=_maxY; - } - - if (maxZ>_maxZ) - { - maxZ=_maxZ; - } - - //-- - SetGeneralMinMax(minX,maxX,minY,maxY,minZ,maxZ); +void BrushFilter::SetBrushTool(int brushtool) { + _brushtool = brushtool; } - - //--------------------------------------------------------------------------- -void BrushFilter::Run() // virtual -{ - if (_image!=NULL) - { - float value=(float)_graylevel; - int i,j,k; - - int size; - int minX,maxX,minY,maxY,minZ,maxZ; - 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=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 BrushFilter::SetRangeMin(int min) { + _RangeMin = min; } - //--------------------------------------------------------------------------- -void BrushFilter::SetBrushSize( int brushsize ) -{ - _brushsize = brushsize; +void BrushFilter::SetRangeMax(int max) { + _RangeMax = max; } //--------------------------------------------------------------------------- -void BrushFilter::SetBrushForm( int brushform ) -{ - _brushform = brushform; +int BrushFilter::GetRangeMin() { + return (_RangeMin); } //--------------------------------------------------------------------------- -void BrushFilter::SetBrushTool( int brushtool ) -{ - _brushtool = brushtool; +int BrushFilter::GetRangeMax() { + return (_RangeMax); } -