X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBinaryImageOverlayActor.cxx;h=a801ba0c27862f3957d87f59eeba766ff75bf9ac;hb=5f43fcf7f5ebdc4d93a8547190b824cf45ea1255;hp=612d9c01211cdfa66cd98bb5a8399b5cd547ce16;hpb=6ae5074c8a8f2c27b21849f5cdf2cc0cfb369698;p=clitk.git diff --git a/vv/vvBinaryImageOverlayActor.cxx b/vv/vvBinaryImageOverlayActor.cxx index 612d9c0..a801ba0 100644 --- a/vv/vvBinaryImageOverlayActor.cxx +++ b/vv/vvBinaryImageOverlayActor.cxx @@ -49,9 +49,25 @@ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() +{ + mImageActorList.clear(); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvBinaryImageOverlayActor::RemoveActors() { for (unsigned int i = 0; i < mImageActorList.size(); i++) { - mSlicer->GetRenderer()->RemoveActor(mImageActorList[i]); + if (mSlicer != 0) { + if (mSlicer != NULL) { + if (mSlicer->GetRenderer() != 0) { + if (mImageActorList[i] != 0) { + mSlicer->GetRenderer()->RemoveActor(mImageActorList[i]); + } + } + } + } } } //------------------------------------------------------------------------------ @@ -120,7 +136,11 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) mOverlayActor->SetInput(mOverlayMapper->GetOutput()); mOverlayActor->SetPickable(0); mOverlayActor->SetVisibility(IsVisible); - //mOverlayActor->SetOpacity(1.0); + //mOverlayActor->SetOpacity(1.0); + + // FIXME : by default overlay is not interpolated. + // mOverlayActor->SetInterpolate(mSlicer->GetImageActor()->GetInterpolate()); + mOverlayActor->InterpolateOff(); mMapperList.push_back(mOverlayMapper); mImageActorList.push_back(mOverlayActor); @@ -173,7 +193,7 @@ void vvBinaryImageOverlayActor::SetOpacity(double d) //------------------------------------------------------------------------------ -void vvBinaryImageOverlayActor::SetImage(vvImage * image, double bg, bool modeBG) +void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool modeBG) { mImage = image; if (modeBG) {