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

diff --git a/bbtk/src/bbmaracasvisuAxeVolume.cxx b/bbtk/src/bbmaracasvisuAxeVolume.cxx
index 5cb228e..1a72bb5 100644
--- a/bbtk/src/bbmaracasvisuAxeVolume.cxx
+++ b/bbtk/src/bbmaracasvisuAxeVolume.cxx
@@ -91,29 +91,39 @@ void AxeVolume::Process()
 	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();
-	int i,j,k;
+#else
+	mimage->AllocateScalars( outputformat , 1);
+#endif
+
     int sizeLstPointR 	= bbGetInputlstPointR().size();
 	int iAxe,sizeAxe	= bbGetInputlstPointX().size();
-	double rx,ry,rz;
-	double r,rr;
-	unsigned short *p;
+	int ii;
 	int sizeImage 		= sizeX*sizeY*sizeZ;
-	double px,py,pz;
-	double px1,py1,pz1;
-	double px2,py2,pz2;
+	unsigned short *p;
+
 	// Clean image
 	p = (unsigned short*)mimage->GetScalarPointer (0, 0, 0);
-	for ( i=0 ; i<sizeImage ; i++)
+	for ( ii=0 ; ii<sizeImage ; ii++)
 	{
 		*p = 0;
 		p++;
 	}
 
+
+#pragma omp parallel for 
 	for (iAxe=0 ; iAxe<sizeAxe; iAxe++)
 	 {
-printf("AxeVolume %d/%d\n ",iAxe,sizeAxe);
+		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)
 		{
 			r = bbGetInputlstPointR()[ iAxe ]* invSpc[0];