X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvROIActor.cxx;h=4e1a9dc880b487c8b38969c67f567e1fb44cd5a4;hb=db7e5217c37e01705f867061e360fdf3290704c8;hp=2ffde5d62946e2e9e6de6c8bb87f4d8562a93c7b;hpb=0d2c2b622e94b353cef04e5bd39d9f8de7b0d6a7;p=clitk.git diff --git a/vv/vvROIActor.cxx b/vv/vvROIActor.cxx index 2ffde5d..4e1a9dc 100644 --- a/vv/vvROIActor.cxx +++ b/vv/vvROIActor.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,16 +14,16 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ +// vv #include "vvROIActor.h" -#include "vvImageContour.h" #include "vvSlicerManager.h" -#include "vvBinaryImageOverlayActor.h" + +// vtk #include #include #include -//#include #include #include #include @@ -32,51 +32,87 @@ //------------------------------------------------------------------------------ vvROIActor::vvROIActor() -{ - mImageContour.clear(); - mOverlayActors.clear(); +{ mIsVisible = true; mIsContourVisible = false; - mOpacity = 0.7; + mOpacity = 0.5; mIsSelected = false; - mContourWidth = 2; + mContourWidth = 1; mContourColor.resize(3); + m_modeBG = true; + mDepth = 1.0; + mROI = 0; + mSlicerManager = 0; + mContourColor[0] = 1; + mContourColor[1] = 1; + mContourColor[2] = 1; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ vvROIActor::~vvROIActor() -{ +{ +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvROIActor::RemoveActors() +{ + for(unsigned int i= 0; iRemoveActors(); + } + + for(unsigned int i= 0; iRemoveActors(); + } + + Update(true); + //mImageContour.clear(); + //mOverlayActors.clear(); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvROIActor::SetROI(clitk::DicomRT_ROI * s) -{ +{ mROI = s; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::SetContourWidth(int n) { +void vvROIActor::SetContourWidth(int n) +{ mContourWidth = n; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::SetSlicerManager(vvSlicerManager * s) { +void vvROIActor::SetSlicerManager(vvSlicerManager * s) +{ mSlicerManager = s; } //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvROIActor::UpdateImage() +{ + mOverlayActors.clear(); + mImageContour.clear(); + Initialize(mDepth, mIsVisible); + Update(); // No Render +} +//------------------------------------------------------------------------------ + + //------------------------------------------------------------------------------ void vvROIActor::SetVisible(bool b) -{ +{ mIsVisible = b; if (!b) { // remove actor for(unsigned int i= 0; iShowActors(); } - Update(); + //Update(); // No Render } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::SetContourVisible(bool b) { +void vvROIActor::SetContourVisible(bool b) +{ mIsContourVisible = b; if (!b) { // remove actor - for(unsigned int i= 0; iHideActors(); + for(unsigned int i= 0; iHideActors(); } } else { - for(unsigned int i= 0; iShowActors(); + for(unsigned int i= 0; iShowActors(); } } - Update(); + //Update(); // No Render } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -bool vvROIActor::IsVisible() { +bool vvROIActor::IsVisible() +{ return mIsVisible; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -bool vvROIActor::IsContourVisible() { +bool vvROIActor::IsContourVisible() +{ return mIsContourVisible; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::Initialize() { +void vvROIActor::Initialize(double depth, bool IsVisible) +{ if (mROI->GetImage()) { mImageContour.clear(); mOverlayActors.clear(); - for(int i=0; iNumberOfSlicers(); i++) { - mImageContour.push_back(new vvImageContour); + mDepth = depth; + for(int i=0; iGetNumberOfSlicers(); i++) { + mImageContour.push_back(vvImageContour::New()); mImageContour[i]->SetSlicer(mSlicerManager->GetSlicer(i)); mImageContour[i]->SetImage(mROI->GetImage()); - //mImageContour[i]->setColor(1.0, 0.0, 0.0); - mContourColor[0] = 1.0-mROI->GetDisplayColor()[0]; - mContourColor[1] = 1.0-mROI->GetDisplayColor()[1]; - mContourColor[2] = 1.0-mROI->GetDisplayColor()[2]; + // Color of the contour is same of roi color + mContourColor[0] = mROI->GetDisplayColor()[0]; + mContourColor[1] = mROI->GetDisplayColor()[1]; + mContourColor[2] = mROI->GetDisplayColor()[2]; mImageContour[i]->SetColor(mContourColor[0], mContourColor[1], mContourColor[2]); mImageContour[i]->SetLineWidth(mContourWidth); mImageContour[i]->SetPreserveMemoryModeEnabled(true); - mImageContour[i]->SetSlicer(mSlicerManager->GetSlicer(i)); - mImageContour[i]->HideActors(); + mImageContour[i]->SetDepth(mDepth+0.5); + mImageContour[i]->ShowActors(); - mOverlayActors.push_back(new vvBinaryImageOverlayActor); - mOverlayActors[i]->SetImage(mROI->GetImage(), mROI->GetBackgroundValueLabelImage()); + mOverlayActors.push_back(vvBinaryImageOverlayActor::New()); + + // BG or FG + if (m_modeBG) { + mOverlayActors[i]->SetImage(mROI->GetImage(), mROI->GetBackgroundValueLabelImage()); + } + else { + mOverlayActors[i]->SetImage(mROI->GetImage(), mROI->GetForegroundValueLabelImage(), false); + } + + mOverlayActors[i]->SetColor(mROI->GetDisplayColor()[0], mROI->GetDisplayColor()[1], mROI->GetDisplayColor()[2]); mOverlayActors[i]->SetOpacity(mOpacity); mOverlayActors[i]->SetSlicer(mSlicerManager->GetSlicer(i)); - mOverlayActors[i]->Initialize(); + mOverlayActors[i]->Initialize(IsVisible); + mOverlayActors[i]->SetDepth(mDepth); } - connect(mSlicerManager,SIGNAL(UpdateSlice(int,int)),this,SLOT(UpdateSlice(int, int))); - //connect(mSlicerManager,SIGNAL(UpdateTSlice(int,int)),this,SLOT(UpdateSlice(int, int))); + connect(mSlicerManager,SIGNAL(UpdateTSlice(int,int,int)),this,SLOT(UpdateSlice(int, int, int))); connect(mSlicerManager, SIGNAL(AVerticalSliderHasChanged(int, int)), SLOT(UpdateSlice(int, int))); } } @@ -162,74 +210,64 @@ void vvROIActor::Initialize() { //------------------------------------------------------------------------------ -void vvROIActor::Update() -{ - for(int i=0; iNumberOfSlicers(); i++) { - UpdateSlice(i, mSlicerManager->GetSlicer(i)->GetSlice()); +void vvROIActor::SetDepth(double d) +{ + mDepth = d; + if (!mSlicerManager) return; + for(int i=0; iGetNumberOfSlicers(); i++) { + mOverlayActors[i]->SetDepth(d); + mImageContour[i]->SetDepth(d+0.5); } + Update(true); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::UpdateSlice(int slicer, int slices) -{ - if (!mROI->GetImage()) return; +void vvROIActor::Update(bool force) +{ + if (!mSlicerManager) return; + for(int i=0; iGetNumberOfSlicers(); i++) { + UpdateSlice(i, mSlicerManager->GetSlicer(i)->GetSlice(), force); + } +} +//------------------------------------------------------------------------------ - if (!mIsVisible) return; +//------------------------------------------------------------------------------ +void vvROIActor::UpdateSlice(int slicer, int slices, int force) +{ + if (!mROI->GetImage()) return; + if ((!mIsVisible) && (!mIsContourVisible)) return; if (!mSlicerManager) { std::cerr << "Error. No mSlicerManager ?" << std::endl; exit(0); } - // CONTOUR HERE - // DD("vvROIActor::UpdateSlice"); - //DD(mROI->GetName()); - //DD(mIsSelected); - //DD(mROI->GetBackgroundValueLabelImage()); - if (mIsSelected) { - mImageContour[slicer]->Update(1.0);//mROI->GetBackgroundValueLabelImage()); - // mImageContour[slicer]->showActors(); - } if (mIsContourVisible) { - mImageContour[slicer]->SetLineWidth(mContourWidth); mImageContour[slicer]->Update(mROI->GetBackgroundValueLabelImage()+1); - // mImageContour[slicer]->showActors(); } // Refresh overlays - mOverlayActors[slicer]->UpdateSlice(slicer, slices); - - // Do not used the following line : TOO SLOW. - // mSlicerManager->GetSlicer(slicer)->GetRenderWindow()->Render(); + if (mIsVisible) { + mOverlayActors[slicer]->UpdateSlice(slicer, slices, force); + } + //mSlicerManager->GetSlicer(slicer)->Render(); } //------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -// void vvROIActor::UpdateOpacity(double d) { -// if (d == mOpacity) return; -// mOpacity = d; -// for(unsigned int i=0; iSetOpacity(d); -// mOverlayActors[i]->UpdateColor(); -// } -// mSlicerManager->Render(); -// } -//------------------------------------------------------------------------------ - - //------------------------------------------------------------------------------ void vvROIActor::SetOpacity(double d) -{ +{ mOpacity = d; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::SetContourColor(double r, double v, double b) { +void vvROIActor::SetContourColor(double r, double v, double b) +{ mContourColor[0] = r; mContourColor[1] = v; mContourColor[2] = b; @@ -238,14 +276,33 @@ void vvROIActor::SetContourColor(double r, double v, double b) { //------------------------------------------------------------------------------ -std::vector & vvROIActor::GetContourColor() { +void vvROIActor::SetOverlayColor(double r, double v, double b) +{ + if (mROI) + mROI->SetDisplayColor(r,v,b); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +std::vector & vvROIActor::GetContourColor() +{ return mContourColor; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvROIActor::UpdateColor() { +std::vector & vvROIActor::GetOverlayColor() +{ + return mROI->GetDisplayColor(); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvROIActor::UpdateColor() +{ for(unsigned int i=0; iSetOpacity(mOpacity); mOverlayActors[i]->SetColor(mROI->GetDisplayColor()[0], @@ -256,7 +313,8 @@ void vvROIActor::UpdateColor() { for(unsigned int i=0; iSetLineWidth(mContourWidth); mImageContour[i]->SetColor(mContourColor[0], mContourColor[1], mContourColor[2]); - mImageContour[i]->Update(mROI->GetBackgroundValueLabelImage()+1); + if (mIsContourVisible) + mImageContour[i]->Update(mROI->GetBackgroundValueLabelImage()+1); } } //------------------------------------------------------------------------------ @@ -264,7 +322,7 @@ void vvROIActor::UpdateColor() { //------------------------------------------------------------------------------ double vvROIActor::GetOpacity() -{ +{ return mOpacity; } //------------------------------------------------------------------------------ @@ -272,18 +330,36 @@ double vvROIActor::GetOpacity() //------------------------------------------------------------------------------ void vvROIActor::SetSelected(bool b) -{ +{ mIsSelected = b; if (b) { - for(int i=0; iNumberOfSlicers(); i++) { + for(int i=0; iGetNumberOfSlicers(); i++) { mImageContour[i]->SetLineWidth(3.0); mImageContour[i]->ShowActors(); } } else { - for(int i=0; iNumberOfSlicers(); i++) { + for(int i=0; iGetNumberOfSlicers(); i++) { mImageContour[i]->HideActors(); } } } //------------------------------------------------------------------------------ + +//------------------------------------------------------------------------------ +void vvROIActor::CopyParameters(QSharedPointer roi) +{ + // Overlay + SetVisible(roi->IsVisible()); + SetOpacity(roi->GetOpacity()); + SetOverlayColor(roi->GetOverlayColor()[0], roi->GetOverlayColor()[1], roi->GetOverlayColor()[2]); + + // Contour + SetContourVisible(roi->IsContourVisible()); + SetContourWidth(roi->GetContourWidth()); + SetContourColor(roi->GetContourColor()[0], roi->GetContourColor()[1], roi->GetContourColor()[2]); + + // Global + SetDepth(roi->GetDepth()); +} +//------------------------------------------------------------------------------