X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkImageBoundaries.cxx;h=c477aade336f12711fd8376ed00224843a8eca37;hb=edb8e9b8948e7216e06b3ef5228b16f18417ca52;hp=b76ce9624d38023bff3eed9f7fd63dc624a8ae4b;hpb=2ab6bff6c5478054c4fdc9d37304b28151251acb;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkImageBoundaries.cxx b/packages/vtk/src/bbvtkImageBoundaries.cxx
index b76ce96..c477aad 100644
--- a/packages/vtk/src/bbvtkImageBoundaries.cxx
+++ b/packages/vtk/src/bbvtkImageBoundaries.cxx
@@ -30,6 +30,17 @@
 //===== 
 #include "bbvtkImageBoundaries.h"
 #include "bbvtkPackage.h"
+#include "creaVtk_MACROS.h"
+
+
+/*
+
+#include <omp.h>
+
+*/
+
+
+
 namespace bbvtk
 {
 
@@ -40,18 +51,21 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ImageBoundaries,bbtk::AtomicBlackBox);
 //===== 
 void ImageBoundaries::Process()
 {
-	printf("bbtk:vtk::ImageBoundaries::Process start\n");
-	if (bbGetInputIn()!=NULL)
-	{
-		int i,j,k;	
+	if (bbGetInputIn()!=NULL){
 		int ext[6];
 		double value;
 		
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 		bbGetInputIn()->GetWholeExtent(ext);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		bbGetInputIn()->GetExtent(ext);
+#endif
+
 		int maxX	= ext[1]-ext[0]+1;
 		int maxY	= ext[3]-ext[2]+1;
 		int maxZ	= ext[5]-ext[4]+1;
-				
 		int bXMax	= 0;
 		int bYMax	= 0;
 		int bZMax	= 0;
@@ -59,29 +73,57 @@ void ImageBoundaries::Process()
 		int bYMin	= maxY-1;
 		int bZMin	= maxZ-1;
 		
-		for (i=0 ; i<maxX ; i++)
+	
+		double lowervalue = bbGetInputLowerValue();
+		double uppervalue = bbGetInputUpperValue();
+		DEF_POINTER_IMAGE_VTK_CREA(vI,ssI,pI,stI,bbGetInputIn())	
+		long int index=0;
+
+		//int i,j;
+		int k;	
+
+int k1omp=(double)(maxZ-1)*0.0;
+int k2omp=(double)(maxZ-1)*0.2;
+int k3omp=(double)(maxZ-1)*0.4;
+int k4omp=(double)(maxZ-1)*0.6;
+int k5omp=(double)(maxZ-1)*0.8;
+int k6omp=(double)(maxZ-1)*1.0;
+
+//printf("EED ImageBoundaries::Process (with openmp)\n");
+
+// http://jakascorner.com/blog/2016/05/omp-for.html
+//#pragma omp parallel shared(maxZ,bXMin,bYMin,bZMin,bXMax,bYMax,bZMax)
+//{ 
+		#pragma omp for
+		for ( k=0 ; k<maxZ ; k++)
 		{
+//if ( (k1omp==k) || (k2omp==k) || (k3omp==k) || 
+//     (k4omp==k) || (k5omp==k) || (k6omp==k) ) { printf("  %d%\n", (int)(((double)k/(double)(maxZ-1))*100 )); }
+			int i,j;
+			double vItmpOMP;
 			for (j=0 ; j<maxY ; j++)
 			{
-				for (k=0 ; k<maxZ ; k++)
+				for (i=0 ; i<maxX ; i++)
 				{
-					value = bbGetInputIn()->GetScalarComponentAsDouble(i, j, k,0);
-					if ( (value>=bbGetInputLowerValue()) && (value<=bbGetInputUpperValue())  )
+//					double value = bbGetInputIn()->GetScalarComponentAsDouble(i, j, k,0);
+					GETVALUE2_VTK_CREA(vItmpOMP,pI,stI,index) 
+					index++;
+					if ( (vItmpOMP>=lowervalue) && (vItmpOMP<=uppervalue)  )
 					{
-						if (i<bXMin) bXMin=i;
-						if (j<bYMin) bYMin=j;
-						if (k<bZMin) bZMin=k;
-						if (i>bXMax) bXMax=i;
-						if (j>bYMax) bYMax=j;
-						if (k>bZMax) bZMax=k;
+						if (i<bXMin) bXMin = i;
+						if (j<bYMin) bYMin = j;
+						if (k<bZMin) bZMin = k;
+						if (i>bXMax) bXMax = i;
+						if (j>bYMax) bYMax = j;
+						if (k>bZMax) bZMax = k;
 					}
 				} // for k
 			} // for j
 		} // i
-			
+// } // #pragma
+
 		std::vector<int> tmpIndex;		
 		std::vector<int> tmpSize;
-		
 		if (bXMin>bXMax){
 			tmpIndex.push_back(0);
 			tmpIndex.push_back(0);
@@ -97,13 +139,11 @@ void ImageBoundaries::Process()
 			tmpSize.push_back(bYMax-bYMin+1);
 			tmpSize.push_back(bZMax-bZMin+1);
 		}
-			
 		bbSetOutputIndex(tmpIndex);
 		bbSetOutputSize(tmpSize);
 	} else {
 		printf("bbtk warnning: bbtk:vtk:ImageBoundaries box, Input image (In) not initialized..\n");
 	}
-	printf("bbtk:vtk::ImageBoundaries::Process end\n");
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)