X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.cxx;h=3c5b371acb3201e38410c32f21f3ef05548c167a;hb=19dda39fbfb4f8e1019c4f0dd37aa3afc8a3d1d6;hp=a804e1507099a2645db27d23fbc40d8e3ff8e59f;hpb=427d8c0ac838ab789a57b28f62a7f9ff243e7b60;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index a804e15..3c5b371 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -59,7 +59,12 @@ namespace bbvtk
 
    void VolumeRenderer::bbUserSetDefaultValues() 
    { 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	   mRayCastFunction = NULL;
+#else
+	//
+#endif
 	   mMapper			= NULL;
 	   mVolume			= NULL;
 	   bbSetInputColorFunction(0);
@@ -78,11 +83,16 @@ namespace bbvtk
     //    mMIP = vtkVolumeRayCastMIPFunction::New();
     //    mMIP->SetMaximizeMethodToScalarValue();
 
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
     mRayCastFunction = vtkVolumeRayCastCompositeFunction::New();
     mMapper = vtkVolumeRayCastMapper::New();
 	   mMapper->SetVolumeRayCastFunction(mRayCastFunction);
 	   mMapper->AutoAdjustSampleDistancesOn();
-
+#else 
+	  mMapper = vtkFixedPointVolumeRayCastMapper::New();
+#endif
+		   
 	   _volumeProperty = vtkVolumeProperty::New();	
 	_volumeProperty->SetInterpolationTypeToLinear();
 	_volumeProperty->ShadeOn();
@@ -102,11 +112,16 @@ namespace bbvtk
 	//---------------------------------------------------------------------
    void VolumeRenderer::bbUserFinalizeProcessing() 
    { 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	   if (mRayCastFunction!=NULL)
 	   {
 		   mRayCastFunction->Delete();
 		   mRayCastFunction=NULL;
 	   }	  
+#else
+	//
+#endif
 	   if (mMapper!=NULL)
 	   {
 		   mMapper->Delete();
@@ -126,7 +141,13 @@ void VolumeRenderer::Process()
     bool changed = false;
     if ( bbGetInputStatus("In") != bbtk::UPTODATE )
 	{
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		mMapper->SetInput( bbGetInputIn() );
+#else
+		mMapper->SetInputData( bbGetInputIn() );
+#endif
 	 	changed = true;
     }