X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.cxx;fp=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.cxx;h=9da0c3efe4c389d34a471288a61fea67b953dc42;hb=ef49b9b19c6e209bf1b2e2b687de3988b183cb0f;hp=b65e51d22893d90ba8a461a1a5044b6052be254f;hpb=0f2b2115a28d1535f94ed108453579c166060e31;p=bbtk.git diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index b65e51d..9da0c3e 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.cxx @@ -65,7 +65,14 @@ namespace bbvtk opacityTransferFunction = vtkPiecewiseFunction::New(); grayTransferFunction = vtkPiecewiseFunction::New(); mCast = NULL; + +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) mMIP = NULL; +#else + // +#endif + mMapper = NULL; mVolume = NULL; } @@ -88,11 +95,16 @@ namespace bbvtk mCast=NULL; } +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) if (mMIP!=NULL) { mMIP->Delete(); mMIP=NULL; } +#else + // +#endif if (mMapper!=NULL) { @@ -171,10 +183,19 @@ namespace bbvtk // mipProperty->SetAmbient(0.9); // mipProperty->SetDiffuse(0.9); // mipProperty->SetSpecular(0.9); + + +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) mMIP = vtkVolumeRayCastMIPFunction::New(); mMIP->SetMaximizeMethodToScalarValue(); mMapper = vtkVolumeRayCastMapper::New(); mMapper->SetVolumeRayCastFunction(mMIP); +#else + mMapper = vtkFixedPointVolumeRayCastMapper::New(); +#endif + + mCast->Update(); //EED 2017-01-01 Migration VTK7