X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBinaryImageOverlayActor.cxx;h=b5935c3692ea3a7c98afe69b14a7c5fba645bea5;hb=8a3497690d4e39e99b6d5e50cb324449041ea08d;hp=4f2e961995f4e85655ea55244a769612769d56a7;hpb=7710267bd8a9764984655596ff14307b4a8a9884;p=clitk.git diff --git a/vv/vvBinaryImageOverlayActor.cxx b/vv/vvBinaryImageOverlayActor.cxx index 4f2e961..b5935c3 100644 --- a/vv/vvBinaryImageOverlayActor.cxx +++ b/vv/vvBinaryImageOverlayActor.cxx @@ -18,6 +18,9 @@ #include "vvBinaryImageOverlayActor.h" #include "vvImage.h" +#include +#include +#include #include #include #include @@ -28,10 +31,11 @@ #include #include #include +#include //------------------------------------------------------------------------------ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() -{ +{ mTSlice = -1; mSlice = 0; mColor.resize(3); @@ -49,7 +53,7 @@ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() -{ +{ mImageActorList.clear(); } //------------------------------------------------------------------------------ @@ -57,7 +61,7 @@ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::RemoveActors() -{ +{ for (unsigned int i = 0; i < mImageActorList.size(); i++) { if (mSlicer != 0) { if (mSlicer != NULL) { @@ -75,7 +79,7 @@ void vvBinaryImageOverlayActor::RemoveActors() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetColor(double r, double g, double b) -{ +{ mColor[0] = r; mColor[1] = g; mColor[2] = b; @@ -85,7 +89,7 @@ void vvBinaryImageOverlayActor::SetColor(double r, double g, double b) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetSlicer(vvSlicer * slicer) -{ +{ mSlicer = slicer; } //------------------------------------------------------------------------------ @@ -93,7 +97,7 @@ void vvBinaryImageOverlayActor::SetSlicer(vvSlicer * slicer) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) -{ +{ if (!mSlicer) { std::cerr << "ERROR. Please use setSlicer before setSlicer in vvBinaryImageOverlayActor." << std::endl; exit(0); @@ -107,10 +111,30 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) for (unsigned int numImage = 0; numImage < mSlicer->GetImage()->GetVTKImages().size(); numImage++) { // how many intensity ? vtkSmartPointer mOverlayMapper = vtkSmartPointer::New(); - mOverlayMapper->SetInput(mImage->GetVTKImages()[0]); // DS TODO : to change if it is 4D !!! + if (mImage->IsTimeSequence()) + { + #if VTK_MAJOR_VERSION <= 5 + mOverlayMapper->SetInput(mImage->GetVTKImages()[numImage]); +#else + mOverlayMapper->SetInputData(mImage->GetVTKImages()[numImage]); +#endif + } + else { +#if VTK_MAJOR_VERSION <= 5 + mOverlayMapper->SetInput(mImage->GetVTKImages()[0]); +#else + mOverlayMapper->SetInputData(mImage->GetVTKImages()[0]); +#endif + } double range[2]; - mImage->GetVTKImages()[0]->GetScalarRange(range); + if (mImage->IsTimeSequence()) + { + mImage->GetVTKImages()[numImage]->GetScalarRange(range); + } + else { + mImage->GetVTKImages()[0]->GetScalarRange(range); + } int n = range[1]-range[0]+1; mColorLUT->SetRange(range[0],range[1]); mColorLUT->SetNumberOfTableValues(n); @@ -133,14 +157,22 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) mOverlayMapper->SetLookupTable(mColorLUT); vtkSmartPointer mOverlayActor = vtkSmartPointer::New(); +#if VTK_MAJOR_VERSION <= 5 mOverlayActor->SetInput(mOverlayMapper->GetOutput()); +#else + mOverlayActor->GetMapper()->SetInputConnection(mOverlayMapper->GetOutputPort()); +#endif 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); - mSlicer->GetRenderer()->AddActor(mOverlayActor); + mSlicer->GetRenderer()->AddActor(mImageActorList[numImage]); } } //------------------------------------------------------------------------------ @@ -148,7 +180,7 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetOpacity(double d) -{ +{ mAlpha = d; } //------------------------------------------------------------------------------ @@ -190,7 +222,7 @@ void vvBinaryImageOverlayActor::SetOpacity(double d) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool modeBG) -{ +{ mImage = image; if (modeBG) { mBackgroundValue = bg; @@ -206,7 +238,7 @@ void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::HideActors() -{ +{ if (!mSlicer) return; mSlice = mSlicer->GetSlice(); for(unsigned int i=0; iGetSlice(); mTSlice = mSlicer->GetTSlice(); - // for(unsigned int i=0; iVisibilityOn(); UpdateSlice(0, mSlice); - //} // Caller MUST call Render //mSlicer->Render(); } @@ -236,7 +266,7 @@ void vvBinaryImageOverlayActor::ShowActors() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::UpdateColor() -{ +{ mColorLUT->SetTableValue(1, mColor[0], mColor[1], mColor[2], mAlpha); // FG for (unsigned int numImage = 0; numImage < mSlicer->GetImage()->GetVTKImages().size(); numImage++) { // how many intensity ? @@ -244,14 +274,18 @@ void vvBinaryImageOverlayActor::UpdateColor() mOverlayMapper->SetLookupTable(mColorLUT); vtkImageActor * mOverlayActor = mImageActorList[numImage]; +#if VTK_MAJOR_VERSION <= 5 mOverlayActor->SetInput(mOverlayMapper->GetOutput()); +#else + mOverlayActor->SetInputData(mOverlayMapper->GetOutput()); +#endif } } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::UpdateSlice(int slicer, int slice, bool force) -{ +{ if (!mSlicer) return; if (!force) { @@ -271,8 +305,14 @@ void vvBinaryImageOverlayActor::UpdateSlice(int slicer, int slice, bool force) int orientation = mSlicer->GetOrientation(); int maskExtent[6]; ComputeExtent(orientation, mSlice, imageExtent, maskExtent); - ComputeExtent(maskExtent, maskExtent, mSlicer->GetImage()->GetFirstVTKImageData(), mImage->GetFirstVTKImageData()); + ComputeExtent(maskExtent, maskExtent, mSlicer->GetImage()->GetVTKImages()[mTSlice], mImage->GetVTKImages()[mTSlice]); +#if VTK_MAJOR_VERSION <= 5 mSlicer->ClipDisplayedExtent(maskExtent, mMapperList[mTSlice]->GetInput()->GetWholeExtent()); +#else + mSlicer->ClipDisplayedExtent(maskExtent, mMapperList[mTSlice]->GetInput()->GetInformation()->Get(vtkDataObject::DATA_EXTENT())); +#endif + HideActors(); + mImageActorList[mTSlice]->VisibilityOn(); SetDisplayExtentAndCameraPosition(orientation, mSlice, maskExtent, mImageActorList[mTSlice], mDepth); // set previous slice @@ -287,7 +327,7 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, int slice, int * inExtent, int * outExtent) -{ +{ switch (orientation) { case vtkImageViewer2::SLICE_ORIENTATION_XY: for(int i=0; i<4; i++) outExtent[i] = inExtent[i]; @@ -309,13 +349,24 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, //---------------------------------------------------------------------------- void vvBinaryImageOverlayActor::ComputeExtent(int * inExtent, int * outExtent, vtkImageData * image, vtkImageData * overlay) -{ +{ + for(int i=0; i<3; i++) { + double a = (image->GetOrigin()[i] + inExtent[i*2]*image->GetSpacing()[i] - + overlay->GetOrigin()[i]) / overlay->GetSpacing()[i]; + double b = (image->GetOrigin()[i] + inExtent[i*2+1]*image->GetSpacing()[i] - + overlay->GetOrigin()[i]) / overlay->GetSpacing()[i]; + outExtent[i*2] = lrint(a); + outExtent[i*2+1] = lrint(b); + } + + /* // FIXME (original) outExtent[0] = (int)lrint(((image->GetOrigin()[0] + inExtent[0]*image->GetSpacing()[0]) - overlay->GetOrigin()[0]) / overlay->GetSpacing()[0]); outExtent[1] = (int)lrint(((image->GetOrigin()[0] + inExtent[1]*image->GetSpacing()[0]) - overlay->GetOrigin()[0]) / overlay->GetSpacing()[0]); outExtent[2] = (int)lrint(((image->GetOrigin()[1] + inExtent[2]*image->GetSpacing()[1]) - overlay->GetOrigin()[1]) / overlay->GetSpacing()[1]); outExtent[3] = (int)lrint(((image->GetOrigin()[1] + inExtent[3]*image->GetSpacing()[1]) - overlay->GetOrigin()[1]) / overlay->GetSpacing()[1]); outExtent[4] = (int)lrint(((image->GetOrigin()[2] + inExtent[4]*image->GetSpacing()[2]) - overlay->GetOrigin()[2]) / overlay->GetSpacing()[2]); outExtent[5] = (int)lrint(((image->GetOrigin()[2] + inExtent[5]*image->GetSpacing()[2]) - overlay->GetOrigin()[2]) / overlay->GetSpacing()[2]); + */ } //---------------------------------------------------------------------------- @@ -326,7 +377,7 @@ void vvBinaryImageOverlayActor::SetDisplayExtentAndCameraPosition(int orientatio int * extent, vtkImageActor * actor, double position) -{ +{ /* FIXME Error according to camera orientation */