From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Mon, 13 Sep 2021 13:22:22 +0000 (+0200)
Subject: #3470 merge vtk8itk5wx3-mingw64
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=34f55be8df9ba7e59735deba99c6f52b3046abd3;p=creaMaracasVisu.git

#3470 merge vtk8itk5wx3-mingw64
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fbc029..6eac5f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,10 @@ ENDIF(WIN32)
 ##. This cmake code is not working ??????   MacOs..
 
 message(STATUS "Checking OpenMP")
-find_package(OpenMP)
+find_package(OpenMP )
+if(OpenMP_CXX_FOUND)
+    message("OpenMP. Yessssssss")
+endif()
 IF(OPENMP_FOUND)
     message("Found OpenMP! ^_^")
     # add flags for OpenMP
diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index aba4fc8..be8c85c 100644
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -6,8 +6,9 @@
 #include "bbcreaMaracasVisuManualPaint_Model.h"
 #include "bbcreaMaracasVisuPackage.h"
 
-#include <omp.h>
-
+/* EED 20210-09-13  Not compiling in MacOs
+ #include <omp.h>
+*/
 
 namespace bbcreaMaracasVisu
 {
@@ -268,15 +269,9 @@ printf("EED ManualPaint_Model::Process  ByImagePoints (with openmp)  size=%d
 				for (index=0; index<size; index++)
 				{
 					if ( (k1omp==index) || (k2omp==index) || (k3omp==index) || 
-						 (k4omp==index) || (k5omp==index) || (k6omp==index) ) 
-					{ 
-						if (size==1) 
-						{ 
-							printf("  100% (just one element)\n"); 
-						} else {
-							printf("  %d%%  omp_get_num_threads=%d\n", (int)(((double)index/(double)(size-1))*100 ),  omp_get_num_threads() ); 
-						} 
-					}// if K#omp
+						 (k4omp==index) || (k5omp==index) || (k6omp==index) )
+                        { printf("  %d%\n", (int)(((double)index/(double)(size-1))*100 )); }
+                    
 //					double value1;
 //					GETVALUE2_VTK_CREA(value1,pBIP,sTBIP,index)
 //					if (value1>0)
diff --git a/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx b/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx
index a3fafa0..7e37121 100644
--- a/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx
+++ b/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx
@@ -120,7 +120,7 @@ void ReadCreaContourFile::Process()
 			bbSetOutputLstIndexs( LstIndexs );
 
 			} else {
-						printf("EED Warnning!  ReadCreaContourFile::Process  %s is not a creaContour .roi file\n",bbGetInputFileNameRoi() );
+						printf("EED Warnning!  ReadCreaContourFile::Process  %s is not a creaContour .roi file\n",bbGetInputFileNameRoi().c_str() );
 			} // if --CreaContour--
 		} // if ff
 	} // if FileNameRoi