X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.h;fp=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.h;h=124abe89cb4e980a139d1019716717b32533ede2;hb=ef49b9b19c6e209bf1b2e2b687de3988b183cb0f;hp=486cc7ea6c7b5c5eafb24207e96428e754851ea6;hpb=0f2b2115a28d1535f94ed108453579c166060e31;p=bbtk.git diff --git a/packages/vtk/src/bbvtkMIPCreator.h b/packages/vtk/src/bbvtkMIPCreator.h index 486cc7e..124abe8 100644 --- a/packages/vtk/src/bbvtkMIPCreator.h +++ b/packages/vtk/src/bbvtkMIPCreator.h @@ -57,8 +57,16 @@ #include "vtkImageData.h" #include -#include -#include + +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) + #include + #include +#else + #include +#endif + + #include "vtkProp3D.h" #include "vtkVolume.h" @@ -85,8 +93,18 @@ namespace bbvtk std::vector DensityPoints; std::vector OpacityValues; vtkImageShiftScale *mCast; - vtkVolumeRayCastMIPFunction *mMIP; - vtkVolumeRayCastMapper *mMapper; + + +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) + vtkVolumeRayCastMIPFunction *mMIP; + vtkVolumeRayCastMapper *mMapper; +#else + vtkFixedPointVolumeRayCastMapper *mMapper; +#endif + + + vtkVolume *mVolume; vtkPiecewiseFunction *opacityTransferFunction; vtkPiecewiseFunction *grayTransferFunction;