commit

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / BrushFilter.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
index bdbd267d4bdc75a3424c09640b00b6e91342c9b5..964e0e645b5554ca34141ed57293f63a4029a511 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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() {
@@ -79,7 +104,6 @@ void BrushFilter::Run() // virtual
        if (_image != NULL)
        {
                float value = (float) _graylevel;
-               this->_MRegion->value = (float) _graylevel;
                int i, j, k;
 
                int size;
@@ -88,6 +112,8 @@ void BrushFilter::Run() // virtual
 
                double xx, yy, zz, rr = size * size;
 
+printf("EED BrushFilter::Run() %d  %d\n", _RangeMin, _RangeMax);
+
                for (i = minX; i <= maxX; i++) {
                        xx = _px - i;
                        xx = xx * xx;
@@ -98,23 +124,23 @@ void BrushFilter::Run() // virtual
 //                    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) {
+                                       float scalarComponent = _image->GetScalarComponentAsFloat(i,j, k, 0);
+                                       if ((_RangeMin <= scalarComponent)
+                                                       && (scalarComponent <= _RangeMax )) {
+                                               if (_brushform == 0) 
+                                               {
+                                                       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);
+                                                               this->_IMManager->AddModifiedPixel(i, j, k); //DFCH
+                                                               _image->SetScalarComponentFromFloat(i, j, k, 0,value);
                                                        }
-                                               } // _brushform
+                                               } // _brushform 1
                                        } //   GetRangeMin && GetRangeMax
 
 //                    } //if _minX _maxX _minY _maxY _minZ _maxZ
@@ -156,11 +182,11 @@ void BrushFilter::SetRangeMax(int max) {
 
 //---------------------------------------------------------------------------
 int BrushFilter::GetRangeMin() {
-       return (_RangeMin);
+       return _RangeMin;
 }
 
 //---------------------------------------------------------------------------
 int BrushFilter::GetRangeMax() {
-       return (_RangeMax);
+       return _RangeMax;
 }