#3418 creaMaracas Visu Feature New Normal - ManualPaint_model with openmp

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index 2a64b94278b5d122d0180a0ac6c7663b13ac0ab2..aabc509c1236ab907a37503ff8bf75ddf716e288 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -81,7 +81,7 @@ long int k3omp=(double)(size2-1)*0.4;
 long int k4omp=(double)(size2-1)*0.6;
 long int k5omp=(double)(size2-1)*0.8;
 long int k6omp=(double)(size2-1)*1.0;
-printf("EED ManualPaint_Model::LstPointOMPAnalice (with openmp)  size=%ld\n",size2);
+printf("EED ManualPaint_Model::LstPointOMPAnalice (with openmp)  size=%d\n",size2);
 #pragma omp parallel for 
                for (i2=0;i2<size2;i2++)
                {

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
index 0f359e6c9f3e0f16a61bedb5566929d51fbf95f2..0e1afbb06d4c16da7bf52b37e3df3d2664c696de 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -78,8 +78,8 @@ void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
        if (maxY >= _dimY) { maxY = _dimY-1; }
        if (maxZ >= _dimZ) { maxZ = _dimZ-1; }
 
-       //--
-       SetGeneralMinMax(minX, maxX, minY, maxY, minZ, maxZ);
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//     SetGeneralMinMax(minX, maxX, minY, maxY, minZ, maxZ);
 }
 
 //---------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
index 868583ab83d2408dda9fdf1b30eec4c46cff8b4a..fd1bc124d509393de79c95c8bd5bb7beb2f35809 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -141,7 +141,7 @@ void ManualPaintModel::SetBrushForm(int brushform)
        _brushfilter->SetBrushForm(brushform);
 }
 
-//---------------------------------------------------------------------------
+//--------------------C:\Eduardo\Creatis\C11\ct\cs\creaMaracasVisu-------------------------------------------------------
 void ManualPaintModel::SetToleranceFill(double tolerancefill) 
 {
        _fillfilter->SetToleranceFill(tolerancefill);