X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvROIActor.cxx;h=7a07b2963b93aeb67b350b441827391aba1dc17c;hb=5cc64cb817d78d671eb20d219cc19f9ad5b1e5c1;hp=2ffde5d62946e2e9e6de6c8bb87f4d8562a93c7b;hpb=0d2c2b622e94b353cef04e5bd39d9f8de7b0d6a7;p=clitk.git

diff --git a/vv/vvROIActor.cxx b/vv/vvROIActor.cxx
index 2ffde5d..7a07b29 100644
--- a/vv/vvROIActor.cxx
+++ b/vv/vvROIActor.cxx
@@ -16,14 +16,16 @@
   - 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 <vtkImageActor.h>
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
-//#include <vtkRenderWindow.h>
 #include <vtkMarchingSquares.h>
 #include <vtkImageClip.h>
 #include <vtkImageData.h>
@@ -39,8 +41,9 @@ vvROIActor::vvROIActor()
   mIsContourVisible = false;
   mOpacity = 0.7;
   mIsSelected = false;
-  mContourWidth = 2;
+  mContourWidth = 1;
   mContourColor.resize(3);
+  m_modeBG = true;
 }
 //------------------------------------------------------------------------------
 
@@ -74,6 +77,23 @@ void vvROIActor::SetSlicerManager(vvSlicerManager * s) {
 //------------------------------------------------------------------------------
 
 
+//------------------------------------------------------------------------------
+void vvROIActor::UpdateImage()
+{
+  for(unsigned int i= 0; i<mOverlayActors.size(); i++) {
+    mOverlayActors[i]->HideActors();
+    delete mOverlayActors[i];
+  }
+  for(unsigned int i= 0; i<mImageContour.size(); i++) {
+    mImageContour[i]->HideActors();
+    delete mImageContour[i];
+  }
+  Initialize();
+  Update(); // No Render
+}
+//------------------------------------------------------------------------------
+
+
 //------------------------------------------------------------------------------
 void vvROIActor::SetVisible(bool b)
 {
@@ -85,7 +105,7 @@ void vvROIActor::SetVisible(bool b)
     for(unsigned int i= 0; i<mOverlayActors.size(); i++)
       mOverlayActors[i]->ShowActors();
   }
-  Update();
+  Update(); // No Render
 }
 //------------------------------------------------------------------------------
 
@@ -94,18 +114,16 @@ void vvROIActor::SetVisible(bool b)
 void vvROIActor::SetContourVisible(bool b) {
   mIsContourVisible = b;
   if (!b) { // remove actor
-    for(unsigned int i= 0; i<mOverlayActors.size(); i++) {
-      //      mOverlayActors[i]->HideActors();
+    for(unsigned int i= 0; i<mImageContour.size(); i++) {
       mImageContour[i]->HideActors();
     }
   }
   else {
-    for(unsigned int i= 0; i<mOverlayActors.size(); i++) {
-      // mOverlayActors[i]->ShowActors();
+    for(unsigned int i= 0; i<mImageContour.size(); i++) {
       mImageContour[i]->ShowActors();
     }
   }
-  Update();
+  Update(); // No Render
 }
 //------------------------------------------------------------------------------
 
@@ -133,10 +151,9 @@ void vvROIActor::Initialize() {
       mImageContour.push_back(new vvImageContour);
       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];
+      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);
@@ -144,7 +161,16 @@ void vvROIActor::Initialize() {
       mImageContour[i]->HideActors();
       
       mOverlayActors.push_back(new vvBinaryImageOverlayActor);
-      mOverlayActors[i]->SetImage(mROI->GetImage(), mROI->GetBackgroundValueLabelImage());
+
+      // 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]);
@@ -175,51 +201,22 @@ void vvROIActor::Update()
 void vvROIActor::UpdateSlice(int slicer, int slices)
 {
   if (!mROI->GetImage())  return;
-
-  if (!mIsVisible) 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();
 }
 //------------------------------------------------------------------------------
 
 
-//------------------------------------------------------------------------------
-// void vvROIActor::UpdateOpacity(double d) {
-//   if (d == mOpacity) return;
-//   mOpacity = d;
-//   for(unsigned int i=0; i<mOverlayActors.size(); i++) {
-//     mOverlayActors[i]->SetOpacity(d);
-//     mOverlayActors[i]->UpdateColor();
-//   }
-//   mSlicerManager->Render();
-// }
-//------------------------------------------------------------------------------
-
-
 //------------------------------------------------------------------------------
 void vvROIActor::SetOpacity(double d)
 {
@@ -256,7 +253,8 @@ void vvROIActor::UpdateColor() {
   for(unsigned int i=0; i<mImageContour.size(); i++) {
     mImageContour[i]->SetLineWidth(mContourWidth);
     mImageContour[i]->SetColor(mContourColor[0], mContourColor[1], mContourColor[2]);
-    mImageContour[i]->Update(mROI->GetBackgroundValueLabelImage()+1);
+    if (mIsContourVisible)
+      mImageContour[i]->Update(mROI->GetBackgroundValueLabelImage()+1);
   }
 }
 //------------------------------------------------------------------------------
@@ -273,6 +271,7 @@ double vvROIActor::GetOpacity()
 //------------------------------------------------------------------------------
 void vvROIActor::SetSelected(bool b)
 {
+  DD(" Not used yet");
   mIsSelected = b;
   if (b) {
     for(int i=0; i<mSlicerManager->NumberOfSlicers(); i++) {