X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuAxeVolume.cxx;h=b660b691d8f7b518960be41833eace21570a4d47;hb=d79fc05657cfa43ed1cd6937a5acaeaf70e09b45;hp=1a72bb5e4a55e8daf80b77784cd5c8f716081092;hpb=5d9da84b1d89ea1ab065d3d33c7001f9d9272968;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuAxeVolume.cxx b/bbtk/src/bbmaracasvisuAxeVolume.cxx
index 1a72bb5..b660b69 100644
--- a/bbtk/src/bbmaracasvisuAxeVolume.cxx
+++ b/bbtk/src/bbmaracasvisuAxeVolume.cxx
@@ -26,6 +26,8 @@
 #include "bbmaracasvisuAxeVolume.h"
 #include "bbcreaMaracasVisuPackage.h"
 
+#include "creaVtk_MACROS.h"
+
 namespace bbcreaMaracasVisu
 {
 
@@ -66,116 +68,146 @@ int AxeVolume::GetTypeFormat( std::string formatStr , vtkImageData* image )
 
 void AxeVolume::Process()
 {
-	if ( mimage!=NULL )
-	{
-		mimage->Delete();
-	}
-
-	int ext[6];
-	bbGetInputIn()->GetExtent(ext);
-	int sizeX=ext[1]-ext[0]+1;
-	int sizeY=ext[3]-ext[2]+1;
-	int sizeZ=ext[5]-ext[4]+1;
-
-    double spc[3];
-	bbGetInputIn()->GetSpacing(spc);
-    double invSpc[3];
-    invSpc[0] = 1/spc[0];
-    invSpc[1] = 1/spc[1];
-    invSpc[2] = 1/spc[2];
-
-	int outputformat = GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
-
-	mimage = vtkImageData::New();
-	mimage->SetSpacing(bbGetInputIn()->GetSpacing());
-	mimage->SetDimensions(bbGetInputIn()->GetDimensions());
-	mimage->SetExtent(bbGetInputIn()->GetExtent());
-	mimage->SetOrigin(bbGetInputIn()->GetOrigin());
-//EED 2017-01-01 Migration VTK7
-#if VTK_MAJOR_VERSION <= 5
-	mimage->SetScalarType( outputformat );
-	mimage->AllocateScalars();
-#else
-	mimage->AllocateScalars( outputformat , 1);
-#endif
-
-    int sizeLstPointR 	= bbGetInputlstPointR().size();
-	int iAxe,sizeAxe	= bbGetInputlstPointX().size();
-	int ii;
-	int sizeImage 		= sizeX*sizeY*sizeZ;
-	unsigned short *p;
-
-	// Clean image
-	p = (unsigned short*)mimage->GetScalarPointer (0, 0, 0);
-	for ( ii=0 ; ii<sizeImage ; ii++)
+	if (bbGetInputIn()!=NULL)
 	{
-		*p = 0;
-		p++;
-	}
-
-
-#pragma omp parallel for 
-	for (iAxe=0 ; iAxe<sizeAxe; iAxe++)
-	 {
-		int i,j,k;
-		double rx,ry,rz;
-		double r,rr;
-		double px,py,pz;
-		double px1,py1,pz1;
-		double px2,py2,pz2;
-		printf("AxeVolume %d/%d\n ",iAxe,sizeAxe);
-		if (iAxe<sizeLstPointR)
+		if ( mimage!=NULL )
 		{
-			r = bbGetInputlstPointR()[ iAxe ]* invSpc[0];
-		} else {
-			if (bbGetInputlstPointR().size()>=1)
+			mimage->Delete();
+		}
+
+		int ext[6];
+		bbGetInputIn()->GetExtent(ext);
+		int sizeX=ext[1]-ext[0]+1;
+		int sizeY=ext[3]-ext[2]+1;
+		int sizeZ=ext[5]-ext[4]+1;
+
+		double spc[3];
+		bbGetInputIn()->GetSpacing(spc);
+		double invSpc[3];
+		invSpc[0] = 1/spc[0];
+		invSpc[1] = 1/spc[1];
+		invSpc[2] = 1/spc[2];
+
+		int outputformat = GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
+
+		mimage = vtkImageData::New();
+		mimage->SetSpacing(bbGetInputIn()->GetSpacing());
+		mimage->SetDimensions(bbGetInputIn()->GetDimensions());
+		mimage->SetExtent(bbGetInputIn()->GetExtent());
+		mimage->SetOrigin(bbGetInputIn()->GetOrigin());
+	//EED 2017-01-01 Migration VTK7
+	#if VTK_MAJOR_VERSION <= 5
+		mimage->SetScalarType( outputformat );
+		mimage->AllocateScalars();
+	#else
+		mimage->AllocateScalars( outputformat , 1);
+	#endif
+
+		int sizeLstPointR 	= bbGetInputlstPointR().size();
+		int iAxe,sizeAxe	= bbGetInputlstPointX().size();
+		int ii;
+		int sizeImage 		= sizeX*sizeY*sizeZ;
+	//	unsigned short *p;
+
+		// Clean image
+		memset( (char*)mimage->GetScalarPointer(0,0,0) , 0, sizeImage*(mimage->GetScalarSize()) );
+
+	//	p = (unsigned short*)mimage->GetScalarPointer (0, 0, 0);
+	//	for ( ii=0 ; ii<sizeImage ; ii++)
+	//	{
+	//		*p = 0;
+	//		p++;
+	//	}
+
+
+	DEF_POINTER_IMAGE_VTK_CREA(vI,ssI,pI,stI,mimage)
+
+
+	int k1omp=(double)(sizeAxe-1)*0.0;
+	int k2omp=(double)(sizeAxe-1)*0.2;
+	int k3omp=(double)(sizeAxe-1)*0.4;
+	int k4omp=(double)(sizeAxe-1)*0.6;
+	int k5omp=(double)(sizeAxe-1)*0.8;
+	int k6omp=(double)(sizeAxe-1)*1.0;
+
+	printf("EED AxeVolume::Process (with openmp)\n");
+
+	#pragma omp parallel for 
+		for (iAxe=0 ; iAxe<sizeAxe; iAxe++)
+		 {
+	if ( (k1omp==iAxe) || (k2omp==iAxe) || (k3omp==iAxe) || 
+		 (k4omp==iAxe) || (k5omp==iAxe) || (k6omp==iAxe) ) { printf("  %d%\n", (int)(((double)iAxe/(double)(sizeAxe-1))*100 )); }
+			int i,j,k;
+			double rx,ry,rz;
+			double r,rr;
+			double px,py,pz;
+			double px1,py1,pz1;
+			double px2,py2,pz2;
+			double vItmpOMP;
+
+			if (iAxe<sizeLstPointR)
 			{
-				r = bbGetInputlstPointR()[ bbGetInputlstPointR().size()-1 ]    * invSpc[0];
+				r = bbGetInputlstPointR()[ iAxe ]* invSpc[0];
 			} else {
-				r = 1;
-			}
-		}
-		px = bbGetInputlstPointX()[iAxe] * invSpc[0];
-		py = bbGetInputlstPointY()[iAxe] * invSpc[1];
-		pz = bbGetInputlstPointZ()[iAxe] * invSpc[2];
-		px1 = px - r;
-		py1 = py - r;
-		pz1 = pz - r;
-		px2 = px + r;
-		py2 = py + r;
-		pz2 = pz + r;
-		rr=r*r;
-
-		for ( i=px1 ; i<=px2 ; i++ )
-		{
-			rx	=	i - px;
-			rx	=	rx*rx;
-			for ( j=py1 ; j<py2 ; j++ )
+				if (bbGetInputlstPointR().size()>=1)
+				{
+					r = bbGetInputlstPointR()[ bbGetInputlstPointR().size()-1 ]    * invSpc[0];
+				} else {
+					r = 1;
+				}
+			} // if iAxe sizeLstPointR
+			px = bbGetInputlstPointX()[iAxe] * invSpc[0];
+			py = bbGetInputlstPointY()[iAxe] * invSpc[1];
+			pz = bbGetInputlstPointZ()[iAxe] * invSpc[2];
+			px1 = px - r;
+			py1 = py - r;
+			pz1 = pz - r;
+			px2 = px + r;
+			py2 = py + r;
+			pz2 = pz + r;
+			rr=r*r;
+
+			long int index;
+			for ( i=px1 ; i<=px2 ; i++ )
 			{
-				ry	=	j - py;
-				ry	=	ry*ry;
-				for ( k=pz1 ; k<pz2 ; k++ )
+				rx	=	i - px;
+				rx	=	rx*rx;
+				for ( j=py1 ; j<py2 ; j++ )
 				{
-					if ( (i>=0) && (i<sizeX) && (j>=0) && (j<sizeY) &&(k>=0) && (k<sizeZ) )
+					ry	=	j - py;
+					ry	=	ry*ry;
+					for ( k=pz1 ; k<pz2 ; k++ )
 					{
-//						p = (unsigned short*)mimage->GetScalarPointer (i, j, k);
-//						if (*p==0)
-						if ( mimage->GetScalarComponentAsDouble(i,j,k,0)==0 )
+						if ( (i>=0) && (i<sizeX) && (j>=0) && (j<sizeY) &&(k>=0) && (k<sizeZ) )
 						{
-							rz	=	k - pz;
-							rz	=	rz*rz;
-							if ( rx + ry + rz <= rr )
+	//						p = (unsigned short*)mimage->GetScalarPointer (i, j, k);
+	//						if (*p==0)
+							index=i+j*sizeX+k*sizeX*sizeY;
+							GETVALUE2_VTK_CREA(vItmpOMP,pI,stI,index)
+	// EED2020-04-25						if ( mimage->GetScalarComponentAsDouble(i,j,k,0)==0 )
+							if ( vI==0 )
 							{
-//								*p=255;
-								mimage->SetScalarComponentFromDouble (i,j,k,0, bbGetInputValue() );
-							}
-						} // *p==0
-					} // if inside point
-				} //for k
-			} //for j
-		} //for i
-	} // for iAxe
-    bbSetOutputOut( mimage );
+								rz	=	k - pz;
+								rz	=	rz*rz;
+								if ( rx + ry + rz <= rr )
+								{
+	//								*p=255;
+									vItmpOMP=bbGetInputValue();
+									SETVALUE2_VTK_CREA(vItmpOMP,pI,stI,index)
+	// EED2020-04-25								mimage->SetScalarComponentFromDouble (i,j,k,0, bbGetInputValue() );
+								}
+							} // *p==0
+						} // if inside point
+					} //for k
+				} //for j
+			} //for i
+		} // for iAxe
+		bbSetOutputOut( mimage );
+	} else  {
+		printf("\n");
+		printf("EED Warnning!!  AxeVolume::Process  The Input In is not set.\n");
+		printf("\n");
+	}// if bbGetInputIn()
 }