X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvStructureSetActor.cxx;h=b7860d350ced70c255df6c1cafe6de881ed1473c;hb=73f0ab806cbb168db4d09908a714f8b7a662ee21;hp=09fc245758ae8d26de3e84140c424f5df31feb73;hpb=1f2d49aa5d3d0e8d5913967e5464505e6f7a61c5;p=clitk.git

diff --git a/vv/vvStructureSetActor.cxx b/vv/vvStructureSetActor.cxx
index 09fc245..b7860d3 100644
--- a/vv/vvStructureSetActor.cxx
+++ b/vv/vvStructureSetActor.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 "vvStructureSetActor.h"
 #include "vvROIActor.h"
@@ -30,6 +30,7 @@ vvStructureSetActor::vvStructureSetActor()
 //------------------------------------------------------------------------------
 vvStructureSetActor::~vvStructureSetActor()
 {
+
 }
 //------------------------------------------------------------------------------
 
@@ -43,7 +44,7 @@ int vvStructureSetActor::GetNumberOfROIs()
 
 
 //------------------------------------------------------------------------------
-std::vector<vvROIActor*> & vvStructureSetActor::GetROIList() 
+std::vector< QSharedPointer<vvROIActor> > & vvStructureSetActor::GetROIList() 
 { 
   return mROIActors; 
 }
@@ -73,16 +74,16 @@ vvROIActor * vvStructureSetActor::GetROIActor(int n)
     std::cerr << "No ROI number " << n << std::endl;
     return NULL;
   }
-  return mROIActors[mMapROIIndex[n]];
+  return mROIActors[mMapROIIndex[n]].data();
 }
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-void vvStructureSetActor::CreateNewROIActor(int n)
+void vvStructureSetActor::CreateNewROIActor(int n, bool modeBG)
 {
   // Check
-  clitk::DicomRT_ROI * roi = mStructureSet->GetROI(n);
+  clitk::DicomRT_ROI * roi = mStructureSet->GetROIFromROINumber(n);
   if (roi == NULL) {
     std::cerr << "Error. No ROI number " << n << std::endl;
     exit(0);
@@ -90,18 +91,19 @@ void vvStructureSetActor::CreateNewROIActor(int n)
 
   // If already exist : delete it
   int old = -1;
-  if (mMapROIIndex.find(n) != mMapROIIndex.end()) {
-    delete mROIActors[mMapROIIndex[n]];
+  if (mMapROIIndex.find(n) != mMapROIIndex.end())
     old = mMapROIIndex[n];
-  }
 
   // Add ROI Actors
-  vvROIActor * actor = new vvROIActor;
-  if (old == -1) mROIActors.push_back(actor);
-  else mROIActors[old] = actor;
+  QSharedPointer<vvROIActor> actor = QSharedPointer<vvROIActor>(new vvROIActor);
+  if (old == -1)
+    mROIActors.push_back(actor);
+  else
+    mROIActors[old] = actor;
+  actor->SetBGMode(modeBG);
   actor->SetROI(roi);
   actor->SetSlicerManager(mSlicerManager);
-  actor->Initialize();
+  actor->Initialize(n+1); // depth is n+1 to start at 1
   mMapROIIndex[n] = mROIActors.size()-1;
 }
 //------------------------------------------------------------------------------