Adapted ggo include dir to new structure

[clitk.git] / vv / vvToolStructureSetManager.cxx

diff --git a/vv/vvToolStructureSetManager.cxx b/vv/vvToolStructureSetManager.cxx
index 257f57e42578bae7471f79831c9dc791023cf2e7..52a4f66820d075ffa4581b46cd8be1e52bab6443 100644 (file)
--- a/vv/vvToolStructureSetManager.cxx
+++ b/vv/vvToolStructureSetManager.cxx
@@ -86,7 +86,7 @@ vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent,
   }
   else {
     MustOpenDialogWhenCreated = false;
-    buttonBox->setEnabled(true);
+    mMainButtonBox->setEnabled(true);
     mCurrentSlicerManager = current;
     mCurrentImage = mCurrentSlicerManager->GetImage();
     mToolWidget->setEnabled(true);
@@ -109,7 +109,7 @@ vvToolStructureSetManager::~vvToolStructureSetManager()
 void vvToolStructureSetManager::Initialize() {
   SetToolName("ROIManager");
   SetToolMenuName("Display ROI");
-  SetToolIconFilename(":/common/icons/lung-overlay.png");
+  SetToolIconFilename(":/common/icons/tool-roi.png");
   SetToolTip("Display ROI from label image.");
   SetToolExperimental(true);
 }
@@ -585,7 +585,7 @@ void vvToolStructureSetManager::ReloadCurrentROI() {
   }
   //  delete mCurrentROI->GetImage();
   // DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetDataReleased());
-//   DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetReferenceCount());
+  //   DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetReferenceCount());
   mCurrentROI->GetImage()->GetFirstVTKImageData()->ReleaseData();
   // DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetDataReleased());
   mCurrentROI->SetImage(mReader->GetOutput());
@@ -600,8 +600,6 @@ void vvToolStructureSetManager::ReloadCurrentROI() {
 //------------------------------------------------------------------------------
 void vvToolStructureSetManager::CheckInputList(std::vector<vvSlicerManager*> & l, int & index) 
 {
-  DD("TODO CheckInputList");
-
   for(unsigned int i=0; i<l.size(); i++) {
     std::vector<vvSlicerManager*>::iterator iter = std::find(mListOfInputs.begin(), mListOfInputs.end(), l[i]);
     if (iter != mListOfInputs.end()) {
@@ -617,46 +615,22 @@ void vvToolStructureSetManager::CheckInputList(std::vector<vvSlicerManager*> & l
 
 //------------------------------------------------------------------------------
 // STATIC
-vvToolStructureSetManager * vvToolStructureSetManager::AddImage(vvSlicerManager * m, vvImage::Pointer image, double BG, bool m_modeBG)
+vvToolStructureSetManager * vvToolStructureSetManager::AddImage(vvSlicerManager * m, std::string name, vvImage::Pointer image, double BG, bool m_modeBG)
 {
-  //  DD("static AddImage");
-  //DD(mListOfInputs.size());
-  
+  // If the tool is open for this vvSlicerManager, use it and return
   if (mListOfOpenTool[m]) {
-    DD("found");
     vvToolStructureSetManager * tool = mListOfOpenTool[m];
-    tool->AddImage(image, "bidon.mhd", BG, m_modeBG);
+    tool->AddImage(image, name, BG, m_modeBG);
     tool->UpdateImage();
-    //    tool->show();
     return tool;
   }
-  else {
-    DD("not found");
-  }
 
-  std::vector<vvSlicerManager*>::iterator iter = 
-    std::find(mListOfInputs.begin(), mListOfInputs.end(), m);
-  if (iter != mListOfInputs.end()) {
-    DD("found");
-    DD("TODO");
-    
-  }
-  else {
-    DD("not found");
-
-    // mMainWindowBase instead of NULL, should be static ?
-    
-    vvToolStructureSetManager * tool = new vvToolStructureSetManager
-      (CREATOR(vvToolStructureSetManager)->GetMainWindow(), Qt::Dialog, m);
-    
-    // WARNING : load list of image and selec -> to change to force mCurrentSlicerManager
-
-    //    tool->InputIsSelected();
-    tool->AddImage(image, "bidon.mhd", BG, m_modeBG);
-    tool->UpdateImage();
-    tool->show();
-    return tool;
-  }
-  return NULL;
+  // If the tool is not open, create it
+  vvToolStructureSetManager * tool = new vvToolStructureSetManager
+    (CREATOR(vvToolStructureSetManager)->GetMainWindow(), Qt::Dialog, m);
+  tool->AddImage(image, name, BG, m_modeBG);
+  tool->UpdateImage();
+  tool->show();
+  return tool;
 }
 //------------------------------------------------------------------------------