X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBinaryImageOverlayActor.cxx;h=1c18def90c2216c5b2d24c7ef3a0834e2f917513;hb=HEAD;hp=612d9c01211cdfa66cd98bb5a8399b5cd547ce16;hpb=9a4dda175415c133b547eec505cd0497d3181f8d;p=clitk.git diff --git a/vv/vvBinaryImageOverlayActor.cxx b/vv/vvBinaryImageOverlayActor.cxx index 612d9c0..1c18def 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,9 +53,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]); + } + } + } + } } } //------------------------------------------------------------------------------ @@ -59,7 +79,7 @@ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetColor(double r, double g, double b) -{ +{ mColor[0] = r; mColor[1] = g; mColor[2] = b; @@ -69,7 +89,7 @@ void vvBinaryImageOverlayActor::SetColor(double r, double g, double b) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetSlicer(vvSlicer * slicer) -{ +{ mSlicer = slicer; } //------------------------------------------------------------------------------ @@ -77,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); @@ -90,11 +110,57 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) // Create an actor for each time slice for (unsigned int numImage = 0; numImage < mSlicer->GetImage()->GetVTKImages().size(); numImage++) { // how many intensity ? + + + + if (!mFusionReslice) { + mFusionReslice = vtkSmartPointer::New(); + mFusionReslice->SetInterpolationModeToLinear(); + mFusionReslice->AutoCropOutputOn(); + mFusionReslice->SetBackgroundColor(-1000,-1000,-1000,1); + } + + mConcatenatedFusionTransform = vtkSmartPointer::New(); + mConcatenatedFusionTransform->Identity(); + if (!mImage->GetTransform().empty()){ + mConcatenatedFusionTransform->Concatenate(mImage->GetTransform()[0]); + } + mConcatenatedFusionTransform->Concatenate(mSlicer->GetSlicingTransform()); + mFusionReslice->SetResliceAxes(mConcatenatedFusionTransform->GetMatrix()); + if (mImage->IsTimeSequence()) { +#if VTK_MAJOR_VERSION <= 5 + mFusionReslice->SetInput(0, mImage->GetVTKImages()[numImage]); + mFusionReslice->UpdateInformation(); +#else + mFusionReslice->SetInputData(0, mImage->GetVTKImages()[numImage]); +#endif + } else { +#if VTK_MAJOR_VERSION <= 5 + mFusionReslice->SetInput(0, mImage->GetVTKImages()[0]); + mFusionReslice->UpdateInformation(); +#else + mFusionReslice->SetInputData(0, mImage->GetVTKImages()[0]); +#endif + } + mFusionReslice->Update(); + + + vtkSmartPointer mOverlayMapper = vtkSmartPointer::New(); - mOverlayMapper->SetInput(mImage->GetVTKImages()[0]); // DS TODO : to change if it is 4D !!! +#if VTK_MAJOR_VERSION <= 5 + mOverlayMapper->SetInput(mFusionReslice->GetOutput()); +#else + mOverlayMapper->SetInputConnection(mFusionReslice->GetOutputPort(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); @@ -117,14 +183,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]); } } //------------------------------------------------------------------------------ @@ -132,7 +206,7 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetOpacity(double d) -{ +{ mAlpha = d; } //------------------------------------------------------------------------------ @@ -173,8 +247,8 @@ 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) { mBackgroundValue = bg; @@ -190,7 +264,7 @@ void vvBinaryImageOverlayActor::SetImage(vvImage * image, double bg, bool modeBG //------------------------------------------------------------------------------ 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(); } @@ -220,7 +292,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 ? @@ -228,14 +300,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) { @@ -255,8 +331,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 @@ -271,7 +353,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]; @@ -293,13 +375,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]); + */ } //---------------------------------------------------------------------------- @@ -310,7 +403,7 @@ void vvBinaryImageOverlayActor::SetDisplayExtentAndCameraPosition(int orientatio int * extent, vtkImageActor * actor, double position) -{ +{ /* FIXME Error according to camera orientation */