#2864 creaMaracasVisu Feature New Normal - Manual Paint , modifies external image...

[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..7e5e76e053466852b97501e80cf761cc407893a3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -27,7 +27,7 @@
 
 BrushFilter::BrushFilter() {
        _brushsize = 1;
-       _brushform = 0; // 0 rectangle-box  ,   1 circle-sphere
+       _brushform = 0; // 0 rectangle-cube  ,   1 circle-sphere
        _brushtool = 0; // 0 pencil         ,   1 fill
 }
 
@@ -101,6 +101,9 @@ void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
 //---------------------------------------------------------------------------
 void BrushFilter::Run() // virtual
 {
+
+printf("EED nBrushFilter::Run  _RangeMax %d \n",_RangeMax);
+
        if (_image != NULL)
        {
                float value = (float) _graylevel;
@@ -111,41 +114,55 @@ 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->_IMManager->AddModifiedPixel(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->_IMManager->AddModifiedPixel(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(
@@ -154,37 +171,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);
-}