X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBinaryImageOverlayActor.cxx;h=612d9c01211cdfa66cd98bb5a8399b5cd547ce16;hb=c2aaedddfc2ad8a9cefcbfcb6b67556198121984;hp=a30206f21dcd618c93727f87b705f3ec6c45ee44;hpb=028b6f344720d2fd8f46ad112874027b0dca865d;p=clitk.git diff --git a/vv/vvBinaryImageOverlayActor.cxx b/vv/vvBinaryImageOverlayActor.cxx index a30206f..612d9c0 100644 --- a/vv/vvBinaryImageOverlayActor.cxx +++ b/vv/vvBinaryImageOverlayActor.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ #include "vvBinaryImageOverlayActor.h" #include "vvImage.h" @@ -38,10 +38,11 @@ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() mAlpha = 0.6; mImage = 0; mSlicer = 0; - mColorLUT = vtkLookupTable::New(); + mColorLUT = vtkSmartPointer::New(); mForegroundValue = 1; mBackgroundValue = 0; m_modeBG = true; + mDepth = 1.0; } //------------------------------------------------------------------------------ @@ -49,11 +50,9 @@ vvBinaryImageOverlayActor::vvBinaryImageOverlayActor() //------------------------------------------------------------------------------ vvBinaryImageOverlayActor::~vvBinaryImageOverlayActor() { - for (unsigned int i = 0; i < mSlicer->GetImage()->GetVTKImages().size(); i++) { + for (unsigned int i = 0; i < mImageActorList.size(); i++) { mSlicer->GetRenderer()->RemoveActor(mImageActorList[i]); } - mImageActorList.clear(); - mMapperList.clear(); } //------------------------------------------------------------------------------ @@ -77,7 +76,7 @@ void vvBinaryImageOverlayActor::SetSlicer(vvSlicer * slicer) //------------------------------------------------------------------------------ -void vvBinaryImageOverlayActor::Initialize() +void vvBinaryImageOverlayActor::Initialize(bool IsVisible) { if (!mSlicer) { std::cerr << "ERROR. Please use setSlicer before setSlicer in vvBinaryImageOverlayActor." << std::endl; @@ -91,14 +90,11 @@ void vvBinaryImageOverlayActor::Initialize() // Create an actor for each time slice for (unsigned int numImage = 0; numImage < mSlicer->GetImage()->GetVTKImages().size(); numImage++) { // how many intensity ? - vtkImageMapToRGBA * mOverlayMapper = vtkImageMapToRGBA::New(); + vtkSmartPointer mOverlayMapper = vtkSmartPointer::New(); mOverlayMapper->SetInput(mImage->GetVTKImages()[0]); // DS TODO : to change if it is 4D !!! - // DD("change to nb of intensity"); double range[2]; mImage->GetVTKImages()[0]->GetScalarRange(range); - // DD(range[0]); -// DD(range[1]); int n = range[1]-range[0]+1; mColorLUT->SetRange(range[0],range[1]); mColorLUT->SetNumberOfTableValues(n); @@ -120,10 +116,10 @@ void vvBinaryImageOverlayActor::Initialize() mOverlayMapper->SetLookupTable(mColorLUT); - vtkImageActor * mOverlayActor = vtkImageActor::New(); + vtkSmartPointer mOverlayActor = vtkSmartPointer::New(); mOverlayActor->SetInput(mOverlayMapper->GetOutput()); mOverlayActor->SetPickable(0); - mOverlayActor->SetVisibility(true); + mOverlayActor->SetVisibility(IsVisible); //mOverlayActor->SetOpacity(1.0); mMapperList.push_back(mOverlayMapper); @@ -177,10 +173,8 @@ void vvBinaryImageOverlayActor::SetOpacity(double d) //------------------------------------------------------------------------------ -void vvBinaryImageOverlayActor::SetImage(vvImage::Pointer image, double bg, bool modeBG) +void vvBinaryImageOverlayActor::SetImage(vvImage * image, double bg, bool modeBG) { - // DD("vvBinaryImageOverlayActor::SetImage"); - //DD(modeBG); mImage = image; if (modeBG) { mBackgroundValue = bg; @@ -240,14 +234,15 @@ void vvBinaryImageOverlayActor::UpdateColor() //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvBinaryImageOverlayActor::UpdateSlice(int slicer, int slice) +void vvBinaryImageOverlayActor::UpdateSlice(int slicer, int slice, bool force) { if (!mSlicer) return; - if (mPreviousSlice == mSlicer->GetSlice()) { - if (mPreviousTSlice == mSlicer->GetTSlice()) { - //DD("=========== NOTHING"); - return; // Nothing to do + if (!force) { + if (mPreviousSlice == mSlicer->GetSlice()) { + if (mPreviousTSlice == mSlicer->GetTSlice()) { + return; // Nothing to do + } } } @@ -260,14 +255,9 @@ void vvBinaryImageOverlayActor::UpdateSlice(int slicer, int slice) int orientation = mSlicer->GetOrientation(); int maskExtent[6]; ComputeExtent(orientation, mSlice, imageExtent, maskExtent); - //ComputeExtent(imageExtent, maskExtent, mSlicer->GetImage()->GetFirstVTKImageData(), mImage->GetFirstVTKImageData()); ComputeExtent(maskExtent, maskExtent, mSlicer->GetImage()->GetFirstVTKImageData(), mImage->GetFirstVTKImageData()); - // std::cout << "maskExtent = " << maskExtent[0] << " " << maskExtent[1] << " " << maskExtent[2] << " " - // << maskExtent[3] << " " << maskExtent[4] << " " << maskExtent[5] << std::endl; mSlicer->ClipDisplayedExtent(maskExtent, mMapperList[mTSlice]->GetInput()->GetWholeExtent()); - // std::cout << "maskExtent = " << maskExtent[0] << " " << maskExtent[1] << " " << maskExtent[2] << " " - // << maskExtent[3] << " " << maskExtent[4] << " " << maskExtent[5] << std::endl; - SetDisplayExtentAndCameraPosition(orientation, mSlice, maskExtent, mImageActorList[mTSlice], 0.0); + SetDisplayExtentAndCameraPosition(orientation, mSlice, maskExtent, mImageActorList[mTSlice], mDepth); // set previous slice mPreviousTSlice = mSlicer->GetTSlice(); @@ -282,9 +272,6 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, int * inExtent, int * outExtent) { - // std::cout << "InExtent = " << inExtent[0] << " " << inExtent[1] << " " << inExtent[2] << " " - // << inExtent[3] << " " << inExtent[4] << " " << inExtent[5] << std::endl; - // DD(orientation); switch (orientation) { case vtkImageViewer2::SLICE_ORIENTATION_XY: for(int i=0; i<4; i++) outExtent[i] = inExtent[i]; @@ -300,8 +287,6 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, outExtent[0] = outExtent[1] = slice; break; } - // std::cout << "OutExtent = " << outExtent[0] << " " << outExtent[1] << " " << outExtent[2] << " " - // << outExtent[3] << " " << outExtent[4] << " " << outExtent[5] << std::endl; } //------------------------------------------------------------------------------ @@ -309,18 +294,12 @@ void vvBinaryImageOverlayActor::ComputeExtent(int orientation, //---------------------------------------------------------------------------- void vvBinaryImageOverlayActor::ComputeExtent(int * inExtent, int * outExtent, vtkImageData * image, vtkImageData * overlay) { - outExtent[0] = (( image->GetOrigin()[0] + inExtent[0]*image->GetSpacing()[0] ) - overlay->GetOrigin()[0]) / - overlay->GetSpacing()[0]; - outExtent[1] = (( image->GetOrigin()[0] + inExtent[1]*image->GetSpacing()[0] ) - overlay->GetOrigin()[0]) / - overlay->GetSpacing()[0]; - outExtent[2] = (( image->GetOrigin()[1] + inExtent[2]*image->GetSpacing()[1] ) - overlay->GetOrigin()[1]) / - overlay->GetSpacing()[1]; - outExtent[3] = (( image->GetOrigin()[1] + inExtent[3]*image->GetSpacing()[1] ) - overlay->GetOrigin()[1]) / - overlay->GetSpacing()[1]; - outExtent[4] = (( image->GetOrigin()[2] + inExtent[4]*image->GetSpacing()[2] ) - overlay->GetOrigin()[2]) / - overlay->GetSpacing()[2]; - outExtent[5] = (( image->GetOrigin()[2] + inExtent[5]*image->GetSpacing()[2] ) - overlay->GetOrigin()[2]) / - overlay->GetSpacing()[2]; + 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]); } //---------------------------------------------------------------------------- @@ -332,23 +311,27 @@ void vvBinaryImageOverlayActor::SetDisplayExtentAndCameraPosition(int orientatio vtkImageActor * actor, double position) { + /* FIXME + Error according to camera orientation + */ + // Set position if (orientation == vtkImageViewer2::SLICE_ORIENTATION_XY) { - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2] > slice) - actor->SetPosition(0,0, position); - else + //if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2] > slice) actor->SetPosition(0,0, -position); + //else + //actor->SetPosition(0,0, position); } if (orientation == vtkImageViewer2::SLICE_ORIENTATION_XZ) { - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1] > slice) - actor->SetPosition(0,position,0); - else + //if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1] > slice) + // actor->SetPosition(0,position,0); + //else actor->SetPosition(0,-position,0); } if (orientation == vtkImageViewer2::SLICE_ORIENTATION_YZ) { - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0] > slice) - actor->SetPosition(position,0, 0); - else + //if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0] > slice) + // actor->SetPosition(position,0, 0); + //else actor->SetPosition(-position,0, 0); } actor->SetDisplayExtent(extent);