#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[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 964e0e645b5554ca34141ed57293f63a4029a511..0f359e6c9f3e0f16a61bedb5566929d51fbf95f2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -25,9 +25,10 @@
 
 #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
 }
 
@@ -38,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;
@@ -48,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;
                }
-       }
-
-       if (_2D3D == 1) // 3D
-                       {
-       }
+       } // _2D3D
 
-       if (minX < _minX) {
-               minX = _minX;
-       }
+       if (_2D3D == 1) {  }  // 3D 
 
-       if (minY < _minY) {
-               minY = _minY;
-       }
+       if (minX < _minX) { minX = _minX; }
+       if (minY < _minY) { minY = _minY; }
+       if (minZ < _minZ) { minZ = _minZ; }
 
-       if (minZ < _minZ) {
-               minZ = _minZ;
-       }
-
-       if (maxX > _maxX) {
-               maxX = _maxX;
-       }
-
-       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);
@@ -103,6 +87,8 @@ void BrushFilter::Run() // virtual
 {
        if (_image != NULL)
        {
+               this->_IMManager->BaseInitialPoint(_px, _py ,_pz);
+
                float value = (float) _graylevel;
                int i, j, k;
 
@@ -111,43 +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;
 
-printf("EED BrushFilter::Run() %d  %d\n", _RangeMin, _RangeMax);
-
-               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 ((_RangeMin <= scalarComponent)
-                                                       && (scalarComponent <= _RangeMax )) {
+                               for (k = minZ; k <= maxZ; k++) 
+                               {
+                                       pixelModify=false;
+                                       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);
+                                                       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 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(
@@ -156,37 +153,21 @@ printf("EED BrushFilter::Run() %d  %d\n", _RangeMin, _RangeMax);
 }
 
 //---------------------------------------------------------------------------
-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;
-}