X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkImageDataStrucPoints.cpp;h=79c9fb6ec7d7278f041bb362791f4c2450924778;hb=e0a6a661908d6f302ae451204ddcd06eb9d1321c;hp=0649c5e85e1e2b64d24e223f712c67c4f8324b48;hpb=05400a294e401b74b2e7a3058f6a4ee3decfc62d;p=creaVtk.git

diff --git a/lib/creaVtk/vtkImageDataStrucPoints.cpp b/lib/creaVtk/vtkImageDataStrucPoints.cpp
index 0649c5e..79c9fb6 100644
--- a/lib/creaVtk/vtkImageDataStrucPoints.cpp
+++ b/lib/creaVtk/vtkImageDataStrucPoints.cpp
@@ -31,6 +31,7 @@
 
 vtkImageDataStrucPoints::vtkImageDataStrucPoints()
 {
+	_structuredPoints=NULL;
 }
 
 vtkImageDataStrucPoints::~vtkImageDataStrucPoints()
@@ -41,8 +42,6 @@ void vtkImageDataStrucPoints::joinComponents(vtkImageData* imageX,  vtkImageData
  											 vtkImageData* Data1, 	vtkImageData* Data2, 	vtkImageData* Data3 ,
 											 vtkImageData* Data4,	vtkImageData* Data5,	vtkImageData* Data6  )
 {
-printf("EED vtkImageDataStrucPoints::joinComponents Start \n");
-
 	if ((imageX!=NULL) && (imageY!=NULL) && (imageZ!=NULL) )
 	{ 
 			int ext[6];
@@ -61,8 +60,7 @@ printf("EED vtkImageDataStrucPoints::joinComponents Start \n");
 			dim[2]=ext[5]-ext[4]+1;	
 			imageY->GetSpacing(spc);
 			double *ptrX=NULL,  *ptrY=NULL,  *ptrZ=NULL;
-			double *ptrD1=NULL, *ptrD2=NULL, *ptrD3=NULL, *ptrD4=NULL, *ptrD5=NULL, *ptrD6=NULL;
-			
+			double *ptrD1=NULL, *ptrD2=NULL, *ptrD3=NULL, *ptrD4=NULL, *ptrD5=NULL, *ptrD6=NULL;			
 			if (imageX!=NULL)  ptrX  = (double *)imageX->GetScalarPointer();
 			if (imageY!=NULL)  ptrY  = (double *)imageY->GetScalarPointer();
 			if (imageZ!=NULL)  ptrZ  = (double *)imageZ->GetScalarPointer();
@@ -72,7 +70,6 @@ printf("EED vtkImageDataStrucPoints::joinComponents Start \n");
 			if (Data4 !=NULL)  ptrD4 = (double *)Data4->GetScalarPointer();
 			if (Data5 !=NULL)  ptrD5 = (double *)Data5->GetScalarPointer();
 			if (Data6 !=NULL)  ptrD6 = (double *)Data6->GetScalarPointer();
-
 			long int sizeimage = dim[0]*dim[1]*dim[2];
 			int components=3;
 		//	if ((Data1!=NULL) && (Data2==NULL) && (Data3==NULL) && (Data4==NULL) && (Data5==NULL) && (Data6==NULL) )  { components=4; }
@@ -89,14 +86,12 @@ printf("EED vtkImageDataStrucPoints::joinComponents Start \n");
 			array2->SetNumberOfComponents(1);
 			array2->Allocate(sizeimage*1, 100 ); // ???
 			array2->SetName("angle");
-
 		printf("EED Warnning .... vtkImageDataStrucPoints::joinComponents  Limpiar este codigo ........ \n");
 		printf("EED Warnning .... vtkImageDataStrucPoints::joinComponents  Limpiar este codigo ........ \n");
 		printf("EED Warnning .... vtkImageDataStrucPoints::joinComponents  Limpiar este codigo ........ \n");
 		printf("EED Warnning .... vtkImageDataStrucPoints::joinComponents  Limpiar este codigo ........ \n");
 		printf("EED Warnning .... vtkImageDataStrucPoints::joinComponents  Limpiar este codigo ........ \n");
 		printf("EED Warnning .... vtkImageDataStrucPoints::joinComponents  Limpiar este codigo ........ \n");
-
 			double vx,vy,vz,d1=0,d2=0,d3=0,d4=0,d5=0,d6=0;
 			int i;
 			for( i = 0 ; i < sizeimage ; i++ )
@@ -156,12 +151,8 @@ printf("EED vtkImageDataStrucPoints::joinComponents Start \n");
 
 	} else { 
 		printf("EED Warnning!  vtkImageDataStrucPoints::joinComponents  imageX or image Y or image Z is EMPTY\n");
+		_structuredPoints=NULL;
 	} // imageX imageY imageZ
-
-
-
-printf("EED vtkImageDataStrucPoints::joinComponents End\n");
-
 }
 
 vtkStructuredPoints* vtkImageDataStrucPoints::getStructuredPoints()