X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBinaryImageOverlayActor.cxx;h=1c18def90c2216c5b2d24c7ef3a0834e2f917513;hb=HEAD;hp=1af316dedf168b7c28c256b73c84c4a157526c53;hpb=067cf5847bb412d0067bcd52d7844377a0a43635;p=clitk.git diff --git a/vv/vvBinaryImageOverlayActor.cxx b/vv/vvBinaryImageOverlayActor.cxx index 1af316d..1c18def 100644 --- a/vv/vvBinaryImageOverlayActor.cxx +++ b/vv/vvBinaryImageOverlayActor.cxx @@ -35,7 +35,7 @@ //------------------------------------------------------------------------------ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() -{ //out << __func__ << endl; +{ mTSlice = -1; mSlice = 0; mColor.resize(3); @@ -53,7 +53,7 @@ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() -{ //out << __func__ << endl; +{ mImageActorList.clear(); } //------------------------------------------------------------------------------ @@ -61,7 +61,7 @@ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::RemoveActors() -{ //out << __func__ << endl; +{ for (unsigned int i = 0; i < mImageActorList.size(); i++) { if (mSlicer != 0) { if (mSlicer != NULL) { @@ -79,7 +79,7 @@ void vvBinaryImageOverlayActor::RemoveActors() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetColor(double r, double g, double b) -{ //out << __func__ << endl; +{ mColor[0] = r; mColor[1] = g; mColor[2] = b; @@ -89,7 +89,7 @@ void vvBinaryImageOverlayActor::SetColor(double r, double g, double b) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetSlicer(vvSlicer * slicer) -{ //out << __func__ << endl; +{ mSlicer = slicer; } //------------------------------------------------------------------------------ @@ -97,7 +97,7 @@ void vvBinaryImageOverlayActor::SetSlicer(vvSlicer * slicer) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) -{ //out << __func__ << endl; +{ if (!mSlicer) { std::cerr << "ERROR. Please use setSlicer before setSlicer in vvBinaryImageOverlayActor." << std::endl; exit(0); @@ -110,15 +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(); #if VTK_MAJOR_VERSION <= 5 - mOverlayMapper->SetInput(mImage->GetVTKImages()[0]); // DS TODO : to change if it is 4D !!! + mOverlayMapper->SetInput(mFusionReslice->GetOutput()); #else - mOverlayMapper->SetInputData(mImage->GetVTKImages()[0]); // DS TODO : to change if it is 4D !!! + 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); @@ -156,7 +198,7 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) mMapperList.push_back(mOverlayMapper); mImageActorList.push_back(mOverlayActor); - mSlicer->GetRenderer()->AddActor(mOverlayActor); + mSlicer->GetRenderer()->AddActor(mImageActorList[numImage]); } } //------------------------------------------------------------------------------ @@ -164,7 +206,7 @@ void vvBinaryImageOverlayActor::Initialize(bool IsVisible) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetOpacity(double d) -{ //out << __func__ << endl; +{ mAlpha = d; } //------------------------------------------------------------------------------ @@ -206,7 +248,7 @@ void vvBinaryImageOverlayActor::SetOpacity(double d) //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool modeBG) -{ //out << __func__ << endl; +{ mImage = image; if (modeBG) { mBackgroundValue = bg; @@ -222,7 +264,7 @@ void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::HideActors() -{ //out << __func__ << endl; +{ 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(); } @@ -252,7 +292,7 @@ void vvBinaryImageOverlayActor::ShowActors() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::UpdateColor() -{ //out << __func__ << endl; +{ 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 ? @@ -271,7 +311,7 @@ void vvBinaryImageOverlayActor::UpdateColor() //------------------------------------------------------------------------------ void vvBinaryImageOverlayActor::UpdateSlice(int slicer, int slice, bool force) -{ //out << __func__ << endl; +{ if (!mSlicer) return; if (!force) { @@ -291,12 +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 @@ -311,7 +353,7 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, int slice, int * inExtent, int * outExtent) -{ //out << __func__ << endl; +{ switch (orientation) { case vtkImageViewer2::SLICE_ORIENTATION_XY: for(int i=0; i<4; i++) outExtent[i] = inExtent[i]; @@ -333,7 +375,7 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, //---------------------------------------------------------------------------- void vvBinaryImageOverlayActor::ComputeExtent(int * inExtent, int * outExtent, vtkImageData * image, vtkImageData * overlay) -{ //out << __func__ << endl; +{ for(int i=0; i<3; i++) { double a = (image->GetOrigin()[i] + inExtent[i*2]*image->GetSpacing()[i] - overlay->GetOrigin()[i]) / overlay->GetSpacing()[i]; @@ -361,7 +403,7 @@ void vvBinaryImageOverlayActor::SetDisplayExtentAndCameraPosition(int orientatio int * extent, vtkImageActor * actor, double position) -{ //out << __func__ << endl; +{ /* FIXME Error according to camera orientation */