X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicer.cxx;h=7405a450bb67f3e35f23aedfbd39abba34cfa8cf;hb=632adadb8b9230458aeab8ddccc736d674edc87a;hp=bcfbbfc0145fa6cc2d8faa3d370726380255761b;hpb=92044073d6c8ff23ca0ebb8664e46c0a8cf86ea0;p=clitk.git diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx index bcfbbfc..7405a45 100644 --- a/vv/vvSlicer.cxx +++ b/vv/vvSlicer.cxx @@ -425,7 +425,7 @@ void vvSlicer::SetOverlay(vvImage::Pointer overlay) mConcatenatedOverlayTransform->Identity(); mConcatenatedOverlayTransform->Concatenate(mOverlay->GetTransform()[0]); mConcatenatedOverlayTransform->Concatenate(mSlicingTransform); - mOverlayReslice->SetResliceTransform(mConcatenatedOverlayTransform); + mOverlayReslice->SetResliceAxes(mConcatenatedOverlayTransform->GetMatrix()); #if VTK_MAJOR_VERSION <= 5 mOverlayReslice->SetInput(0, mOverlay->GetFirstVTKImageData()); mImageReslice->UpdateInformation(); @@ -492,7 +492,7 @@ void vvSlicer::SetFusion(vvImage::Pointer fusion, int fusionSequenceCode) mConcatenatedFusionTransform->Identity(); mConcatenatedFusionTransform->Concatenate(mFusion->GetTransform()[0]); mConcatenatedFusionTransform->Concatenate(mSlicingTransform); - mFusionReslice->SetResliceTransform(mConcatenatedFusionTransform); + mFusionReslice->SetResliceAxes(mConcatenatedFusionTransform->GetMatrix()); #if VTK_MAJOR_VERSION <= 5 mFusionReslice->SetInput(0, mFusion->GetFirstVTKImageData()); mFusionReslice->UpdateInformation(); @@ -597,7 +597,7 @@ void vvSlicer::SetVF(vvImage::Pointer vf) mConcatenatedVFTransform->Identity(); mConcatenatedVFTransform->Concatenate(mVF->GetTransform()[0]); mConcatenatedVFTransform->Concatenate(mSlicingTransform); - mVFReslice->SetResliceTransform(mConcatenatedVFTransform); + mVFReslice->SetResliceAxes(mConcatenatedVFTransform->GetMatrix()); #if VTK_MAJOR_VERSION <= 5 mVFReslice->SetInput(0, mVF->GetFirstVTKImageData()); #else @@ -653,7 +653,9 @@ void vvSlicer::SetVF(vvImage::Pointer vf) #else mVFMapper->SetInputConnection(mGlyphFilter->GetOutputPort()); #endif +#ifndef VTK_OPENGL2 mVFMapper->ImmediateModeRenderingOn(); +#endif mVFMapper->SetLookupTable(mVFColorLUT); if (!mVFActor)