#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 3085a209b22683f968a0f910885bd5f6e32ab43f..0f359e6c9f3e0f16a61bedb5566929d51fbf95f2 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;
+       _brushsize = 5;
        _brushform = 0; // 0 rectangle-cube  ,   1 circle-sphere
        _brushtool = 0; // 0 pencil         ,   1 fill
 }
@@ -50,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
-                       {
-       }
-
-       if (minX < _minX) {
-               minX = _minX;
-       }
+       } // _2D3D
 
-       if (minY < _minY) {
-               minY = _minY;
-       }
+       if (_2D3D == 1) {  }  // 3D 
 
-       if (minZ < _minZ) {
-               minZ = _minZ;
-       }
+       if (minX < _minX) { minX = _minX; }
+       if (minY < _minY) { minY = _minY; }
+       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);
@@ -105,6 +87,8 @@ void BrushFilter::Run() // virtual
 {
        if (_image != NULL)
        {
+               this->_IMManager->BaseInitialPoint(_px, _py ,_pz);
+
                float value = (float) _graylevel;
                int i, j, k;