X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkImageDataStrucPoints.cpp;h=b06c5f20c37987fb8f94e08b09ec4e2a4d0ab071;hb=0a78cc1bbbd1875930b8e9b74053f947e33691ef;hp=5ccc9d82bd16859a90b455d19e90c27a6b4b6dbd;hpb=e4e46361bd0186fcf85cc2b17e54cf65f0b0cca8;p=creaVtk.git

diff --git a/lib/creaVtk/vtkImageDataStrucPoints.cpp b/lib/creaVtk/vtkImageDataStrucPoints.cpp
index 5ccc9d8..b06c5f2 100644
--- a/lib/creaVtk/vtkImageDataStrucPoints.cpp
+++ b/lib/creaVtk/vtkImageDataStrucPoints.cpp
@@ -38,17 +38,20 @@ vtkImageDataStrucPoints::~vtkImageDataStrucPoints()
 }
 void vtkImageDataStrucPoints::joinComponents(vtkImageData* imageX, vtkImageData* imageY, vtkImageData* imageZ)
 {
+	int ext[6];
 	imageY->Modified();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	imageY->Update();
-	int ext[6];
 	imageY->GetWholeExtent(ext);
+#else
+	imageY->GetExtent(ext);
+#endif
 	int dim[3];
-  double spc[3];;
-  dim[0]=ext[1]-ext[0]+1;
-  dim[1]=ext[3]-ext[2]+1;
-  dim[2]=ext[5]-ext[4]+1;	
-	std::cout<<"dim "<< dim[0] <<" "<< dim[1] <<" "<< dim[2] <<std::endl;
-
+	double spc[3];
+	dim[0]=ext[1]-ext[0]+1;
+	dim[1]=ext[3]-ext[2]+1;
+	dim[2]=ext[5]-ext[4]+1;	
 	imageY->GetSpacing(spc);
 
 
@@ -70,7 +73,6 @@ void vtkImageDataStrucPoints::joinComponents(vtkImageData* imageX, vtkImageData*
 
   int i;
 
-printf("EED  vtkImageDataStrucPoints::joinComponents  sizeimage %d\n", sizeimage );
 	for( i = 0 ; i < sizeimage ; i++ )
 	{
 		vx = *ptrX;
@@ -85,12 +87,26 @@ printf("EED  vtkImageDataStrucPoints::joinComponents  sizeimage %d\n", sizeimage
 	_structuredPoints = vtkStructuredPoints::New();
 	_structuredPoints->SetDimensions(dim[0], dim[1], dim[2]);
 	_structuredPoints->SetSpacing(spc);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_structuredPoints->SetScalarTypeToDouble();
 	_structuredPoints->SetNumberOfScalarComponents(3);
+#else
+	vtkInformation* info=_structuredPoints->GetInformation();
+	vtkDataObject::SetPointDataActiveScalarInfo(info, VTK_DOUBLE, 3);
+
+#endif
+
 	_structuredPoints->GetPointData()->SetVectors(array);
 	_structuredPoints->GetPointData()->SetNumberOfTuples(sizeimage);
 	_structuredPoints->Modified();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_structuredPoints->Update();
+#else
+  //...
+#endif
 
 /*
 	_structuredPoints->Print(cout);