X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkImagePlanes.cxx;fp=packages%2Fvtk%2Fsrc%2FbbvtkImagePlanes.cxx;h=ab91a12db3043fd45badc797730e0ed508ce73cf;hb=088ed2b7bdbe14eb85a7245afaa693ddb7a53a97;hp=92476f5e19b8a01a00719c3c671d8a3063169404;hpb=79d06fa7c6441e99291ad3a1949d241f336573d5;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index 92476f5..ab91a12 100644
--- a/packages/vtk/src/bbvtkImagePlanes.cxx
+++ b/packages/vtk/src/bbvtkImagePlanes.cxx
@@ -207,24 +207,56 @@ namespace bbvtk
 	   // EED MPR view orientation correction..
      vtkImageFlip  *flipYFilter = vtkImageFlip::New();
      flipYFilter->SetFilteredAxis(1); // flip y axis
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
      flipYFilter->SetInput( planeWidgetX->GetResliceOutput() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+     flipYFilter->SetInputData( planeWidgetX->GetResliceOutput() );
+#endif
+
      flipYFilter->Update();
 
 	   vtkImageChangeInformation *image = vtkImageChangeInformation::New();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	   image->SetInput(  planeWidgetY->GetResliceOutput()  );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	   image->SetInputData(  planeWidgetY->GetResliceOutput()  );
+#endif
+
 	   image->SetOutputSpacing( 1,1,1 );	   
 	   image->CenterImageOn();
 	   image->Update();
   	   _imageTransform = vtkTransform::New();
 	   vtkImageReslice *slicer =vtkImageReslice::New();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	   slicer->SetInput( image->GetOutput() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	   slicer->SetInputData( image->GetOutput() );
+#endif
+
 	   slicer->SetInformationInput( image->GetOutput() );
 	   slicer->SetResliceTransform( _imageTransform );
 	   slicer->SetOutputOrigin(0 , 0 , 0 );
 	   slicer->SetInterpolationModeToNearestNeighbor();
 	   slicer->Update();	   
 	   vtkImageChangeInformation *imageResult = vtkImageChangeInformation::New();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	   imageResult->SetInput( slicer->GetOutput() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	   imageResult->SetInputData( slicer->GetOutput() );
+#endif
+
 	   double spc[3];
 	    planeWidgetY->GetResliceOutput()->GetSpacing(spc);
 	   imageResult->SetOutputSpacing( spc[1], spc[0], spc[2] ); 
@@ -284,7 +316,14 @@ namespace bbvtk
 	{
 		int dim[3];
 		int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 		bbGetOutputPlaneX()->GetResliceOutput()->GetWholeExtent(ext);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		bbGetOutputPlaneX()->GetResliceOutput()->GetExtent(ext);
+#endif
+
 		dim[0] = ext[1]-ext[0]+1;
 		dim[1] = ext[3]-ext[2]+1;
 		dim[2] = ext[5]-ext[4]+1;
@@ -304,7 +343,14 @@ namespace bbvtk
 			double xSpacing, ySpacing, zSpacing;
 			bbGetInputIn()->GetSpacing(xSpacing, ySpacing, zSpacing);
 
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			bbGetOutputPlaneX()->SetInput(bbGetInputIn());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			bbGetOutputPlaneX()->SetInputData(bbGetInputIn());
+#endif
+
 			bbGetOutputPlaneX()->SetPlaneOrientationToXAxes();	 
 			bbGetOutputPlaneX()->SetSlicePosition((xMax+xMin)/2.*xSpacing);
 
@@ -312,11 +358,25 @@ namespace bbvtk
 			//		   bbGetOutputPlaneX()->SetPoint1( 0*xSpacing, 146*ySpacing, 186*zSpacing);
 			//		   bbGetOutputPlaneX()->SetPoint2( 126*xSpacing, 146*ySpacing, 0*zSpacing);
 
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			bbGetOutputPlaneY()->SetInput(bbGetInputIn());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			bbGetOutputPlaneY()->SetInputData(bbGetInputIn());
+#endif
+
 			bbGetOutputPlaneY()->SetPlaneOrientationToYAxes();
 			bbGetOutputPlaneY()->SetSlicePosition((yMax+yMin)/2.*ySpacing);
 
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			bbGetOutputPlaneZ()->SetInput(bbGetInputIn());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			bbGetOutputPlaneZ()->SetInputData(bbGetInputIn());
+#endif
+
 			bbGetOutputPlaneZ()->SetPlaneOrientationToZAxes();
 			bbGetOutputPlaneZ()->SetSlicePosition((zMax+zMin)/2.*zSpacing);
 
@@ -347,9 +407,15 @@ namespace bbvtk
 		bbGetOutputPlaneZ()->SetResliceInterpolate( bbGetInputInterpolation() );
 
 		
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 		bbGetOutputPlaneX()->GetResliceOutput()->Update();
 		bbGetOutputPlaneY()->GetResliceOutput()->Update(); 
 		bbGetOutputPlaneZ()->GetResliceOutput()->Update(); 		 
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		// ...
+#endif
 		
 		std::vector<int> pointsx = bbGetInputPointsX();
 		std::vector<int> pointsy = bbGetInputPointsY();
@@ -390,7 +456,15 @@ namespace bbvtk
 
 	//for the plane widgets
 			vtkImagePlaneWidget* plane3pts = (vtkImagePlaneWidget*)bbGetOutputPlane3Pts();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			plane3pts->SetInput(bbGetInputIn());			
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			plane3pts->SetInputData(bbGetInputIn());			
+#endif
+
 			double xSpacing, ySpacing, zSpacing;
 			bbGetInputIn()->GetSpacing(xSpacing, ySpacing, zSpacing);
 			plane3pts->SetOrigin(pointsx[0]*xSpacing,pointsy[0]*ySpacing,pointsz[0]*zSpacing);	
@@ -400,7 +474,15 @@ namespace bbvtk
 			plane3pts->SetPoint2((origin[0]+vect2[0]*factor)*xSpacing,
 									(origin[1]+vect2[1]*factor)*ySpacing,
 									(origin[2]+vect2[2]*factor)*zSpacing);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			plane3pts->GetResliceOutput()->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			// ..
+#endif
+
 //To get the slice of image out of the selected volume
 			if (_imageReslicer==NULL){
 				_imageReslicer = vtkImageReslice::New();					
@@ -409,15 +491,34 @@ namespace bbvtk
 				_matrix = vtkMatrix4x4::New();  
 			}
 			_imageReslicer->SetInterpolationMode( bbGetInputInterpolation() );
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			_imageReslicer->SetInput( bbGetInputIn() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			_imageReslicer->SetInputData( bbGetInputIn() );
+#endif
+
+
 			_imageReslicer->SetInformationInput(bbGetInputIn());	
 			//fill out the information with the created vectors and using the spacing of the image
 			_imageReslicer->SetResliceAxesDirectionCosines(newx[0]*xSpacing,newx[1]*xSpacing,newx[2]*xSpacing,
 									vect2[0]*ySpacing,vect2[1]*ySpacing,vect2[2]*ySpacing,
 									crossp[0]*zSpacing,crossp[1]*zSpacing,crossp[2]*zSpacing);			
 			_imageReslicer->SetResliceAxesOrigin(origin[0]*xSpacing,origin[1]*ySpacing,origin[2]*zSpacing);
+
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 			_imageReslicer->GetOutput()->Update();
 			_imageReslicer->GetOutput()->UpdateInformation();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+			// ..
+#endif
+
+
 
 			bbSetOutputImage3Pts(_imageReslicer->GetOutput());