X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.cpp;h=0f359e6c9f3e0f16a61bedb5566929d51fbf95f2;hb=f9901e756bb82bd333310b47607875331616bb29;hp=bdbd267d4bdc75a3424c09640b00b6e91342c9b5;hpb=b37bd791f88bd4c1a6146fadcb88864d7cd1a5c3;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 bdbd267..0f359e6 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp @@ -1,8 +1,34 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + #include "BrushFilter.h" -BrushFilter::BrushFilter() { - _brushsize = 1; - _brushform = 0; // 0 rectangle-box , 1 circle-sphere +BrushFilter::BrushFilter() +{ + _brushsize = 5; + _brushform = 0; // 0 rectangle-cube , 1 circle-sphere _brushtool = 0; // 0 pencil , 1 fill } @@ -13,7 +39,8 @@ BrushFilter::~BrushFilter() // virtual //--------------------------------------------------------------------------- void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY, - int &minZ, int &maxZ, int &size) { + int &minZ, int &maxZ, int &size) +{ size = _brushsize - 1; minX = _px - size; maxX = _px + size; @@ -23,51 +50,33 @@ void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY, 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; } - } + } // _2D3D - if (_2D3D == 1) // 3D - { - } - - if (minX < _minX) { - minX = _minX; - } - - if (minY < _minY) { - minY = _minY; - } - - if (minZ < _minZ) { - minZ = _minZ; - } + if (_2D3D == 1) { } // 3D - if (maxX > _maxX) { - maxX = _maxX; - } + if (minX < _minX) { minX = _minX; } + if (minY < _minY) { minY = _minY; } + if (minZ < _minZ) { minZ = _minZ; } - if (maxY > _maxY) { - maxY = _maxY; - } - - if (maxZ > _maxZ) { - maxZ = _maxZ; - } + if (maxX >= _dimX) { maxX = _dimX-1; } + if (maxY >= _dimY) { maxY = _dimY-1; } + if (maxZ >= _dimZ) { maxZ = _dimZ-1; } //-- SetGeneralMinMax(minX, maxX, minY, maxY, minZ, maxZ); @@ -78,8 +87,9 @@ void BrushFilter::Run() // virtual { if (_image != NULL) { + this->_IMManager->BaseInitialPoint(_px, _py ,_pz); + float value = (float) _graylevel; - this->_MRegion->value = (float) _graylevel; int i, j, k; int size; @@ -87,41 +97,54 @@ void BrushFilter::Run() // virtual FindMinMaxBrush(minX, maxX, minY, maxY, minZ, maxZ, size); double xx, yy, zz, rr = size * size; + float scalarComponent; + bool pixelModify; - for (i = minX; i <= maxX; i++) { + for (i = minX; i <= maxX; i++) + { xx = _px - i; xx = xx * xx; - for (j = minY; j <= maxY; j++) { + 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)) -// { - - float scalarComponent = _image->GetScalarComponentAsFloat(i, - j, k, 0); - if ((this->GetRangeMin() <= scalarComponent) - && (scalarComponent <= this->GetRangeMax())) { - zz = _pz - k; - zz = zz * zz; - if (_brushform == 0) { - this->CalculateMinMaxRegion(i, j, k); //DFCH - _image->SetScalarComponentFromFloat(i, j, k, 0, - value); - } else if (_brushform == 1) { + for (k = minZ; k <= maxZ; k++) + { + pixelModify=false; + scalarComponent = _image->GetScalarComponentAsFloat(i,j, k, 0); + if ((_RangeMin <= scalarComponent) && (scalarComponent <= _RangeMax )) + { + if (_brushform == 0) + { + pixelModify=true; +// this->_IMManager->AddModifiedPixel(i, j, k); //DFCH +// _image->SetScalarComponentFromFloat(i, j, k, 0,value); + } // _brushform 0 + if (_brushform == 1) + { + zz = _pz - k; + zz = zz * zz; if ((xx + yy + zz) <= rr) { - this->CalculateMinMaxRegion(i, j, k); //DFCH - _image->SetScalarComponentFromFloat(i, j, k, 0, - value); + pixelModify=true; +// this->_IMManager->AddModifiedPixel(i, j, k); //DFCH +// _image->SetScalarComponentFromFloat(i, j, k, 0,value); } - } // _brushform + } // _brushform 1 + if (pixelModify==true) + { + this->_IMManager->AddModifiedPixel(i, j, k); //DFCH + if (_image2!=NULL) + { + _image2->SetScalarComponentFromFloat(i, j, k, 0,value); + }else { + _image->SetScalarComponentFromFloat(i, j, k, 0,value); + } + } // if pixelModify } // GetRangeMin && GetRangeMax -// } //if _minX _maxX _minY _maxY _minZ _maxZ - - } //k - } //j - } //i + } //for k + } //for j + } //for i _image->Modified(); } else { printf( @@ -130,37 +153,21 @@ void BrushFilter::Run() // virtual } //--------------------------------------------------------------------------- -void BrushFilter::SetBrushSize(int brushsize) { +void BrushFilter::SetBrushSize(int brushsize) +{ _brushsize = brushsize; } //--------------------------------------------------------------------------- -void BrushFilter::SetBrushForm(int brushform) { +void BrushFilter::SetBrushForm(int brushform) +{ _brushform = brushform; } //--------------------------------------------------------------------------- -void BrushFilter::SetBrushTool(int brushtool) { +void BrushFilter::SetBrushTool(int brushtool) +{ _brushtool = brushtool; } -//--------------------------------------------------------------------------- -void BrushFilter::SetRangeMin(int min) { - _RangeMin = min; -} - -//--------------------------------------------------------------------------- -void BrushFilter::SetRangeMax(int max) { - _RangeMax = max; -} - -//--------------------------------------------------------------------------- -int BrushFilter::GetRangeMin() { - return (_RangeMin); -} - -//--------------------------------------------------------------------------- -int BrushFilter::GetRangeMax() { - return (_RangeMax); -}