From 73ef03ba27e4538aef34ac235b953d6bd1273f08 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 29 Apr 2020 18:52:55 +0200 Subject: [PATCH] #3418 creaMaracas Visu Feature New Normal - ManualPaint_model with openmp --- bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx | 2 +- .../interface/wxWindows/widgets/manualPaint/BrushFilter.cpp | 4 ++-- .../wxWindows/widgets/manualPaint/ManualPaintModel.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx index 2a64b94..aabc509 100644 --- 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= _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 868583a..fd1bc12 100644 --- 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); -- 2.49.0