From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Wed, 29 Apr 2020 16:52:55 +0000 (+0200)
Subject: #3418 creaMaracas Visu Feature New Normal  -  ManualPaint_model with openmp
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=73ef03ba27e4538aef34ac235b953d6bd1273f08;p=creaMaracasVisu.git

#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 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<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 0f359e6..0e1afbb 100644
--- 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 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);