2343 creaMaracasVisu Bug New Normal Interaction between ColorLayer and manualPaint

[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 8b53b3b0ea49b4edab875f17f0a6c48110fb470c..964e0e645b5554ca34141ed57293f63a4029a511 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -112,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;
@@ -122,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) {
+                                       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);
-                                               } else if (_brushform == 1) {
+                                                       _image->SetScalarComponentFromFloat(i, j, k, 0,value);
+                                               } // _brushform 0
+                                               if (_brushform == 1) 
+                                               {
+                                                       zz = _pz - k;
+                                                       zz = zz * zz;
                                                        if ((xx + yy + zz) <= rr) {
                                                                this->_IMManager->AddModifiedPixel(i, j, k); //DFCH
-                                                               _image->SetScalarComponentFromFloat(i, j, k, 0,
-                                                                               value);
+                                                               _image->SetScalarComponentFromFloat(i, j, k, 0,value);
                                                        }
-                                               } // _brushform
+                                               } // _brushform 1
                                        } //   GetRangeMin && GetRangeMax
 
 //                    } //if _minX _maxX _minY _maxY _minZ _maxZ
@@ -180,11 +182,11 @@ void BrushFilter::SetRangeMax(int max) {
 
 //---------------------------------------------------------------------------
 int BrushFilter::GetRangeMin() {
-       return (_RangeMin);
+       return _RangeMin;
 }
 
 //---------------------------------------------------------------------------
 int BrushFilter::GetRangeMax() {
-       return (_RangeMax);
+       return _RangeMax;
 }