#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
index 909db02c41aac42a13866dfa0ae4dc6c1570361c..2db1c0f46a83c61182b34ad83b795b0c738e9232 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -37,15 +37,21 @@ baseFilterManualPaint::baseFilterManualPaint()
        _minX           = 0;
        _minY           = 0;
        _minZ           = 0;
-       _maxX           = 0;
-       _maxY           = 0;
-       _maxZ           = 0;
-       _pMinX          = 0;
-       _pMinY          = 0;
-       _pMinZ          = 0;
-       _pMaxX          = 0;
-       _pMaxY          = 0;
-       _pMaxZ          = 0;
+
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//     _maxX           = 0;
+//     _maxY           = 0;
+//     _maxZ           = 0;
+//     _pMinX          = 0;
+//     _pMinY          = 0;
+//     _pMinZ          = 0;
+//     _pMaxX          = 0;
+//     _pMaxY          = 0;
+//     _pMaxZ          = 0;
+
+       _dimX           = 0;
+       _dimY           = 0;
+       _dimZ           = 0;
        _RangeMin       = 0;
        _RangeMax       = 6000;
 }
@@ -112,21 +118,24 @@ void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2)
                _image2->GetExtent(extB);
 #endif
 
-               _maxX = std::min( ext[1]-ext[0] , extB[1]-extB[0] );
-               _maxY = std::min( ext[3]-ext[2] , extB[3]-extB[2] );
-               _maxZ = std::min( ext[5]-ext[4] , extB[5]-extB[4] );
+               _dimX = std::min( ext[1]-ext[0]+1 , extB[1]-extB[0]+1 );
+               _dimY = std::min( ext[3]-ext[2]+1 , extB[3]-extB[2]+1 );
+               _dimZ = std::min( ext[5]-ext[4]+1 , extB[5]-extB[4]+1 );
        } else {
-               _maxX = ext[1]-ext[0];
-               _maxY = ext[3]-ext[2];
-               _maxZ = ext[5]-ext[4];
+               _dimX = ext[1]-ext[0]+1;
+               _dimY = ext[3]-ext[2]+1;
+               _dimZ = ext[5]-ext[4]+1;
        } // if
 
        _OneColumn      = 1;
-       _OneLine        = _maxX+1;
-       _OnePlane       = (_maxX+1)*(_maxY+1);
+       _OneLine        = _dimX;
+       _OnePlane       = _dimX*_dimY;
 }
 
 
+
+/*//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::ResetGeneralMinMax() 
 {
@@ -149,6 +158,8 @@ void baseFilterManualPaint::SetGeneralMinMax(int minX, int maxX, int minY,
        if (_pMaxY < maxY) { _pMaxY = maxY; }
        if (_pMaxZ < maxZ) { _pMaxZ = maxZ; }
 }
+*/
+
 
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::GetScalarRange(double * range)