Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / vv / vvToolROIManager.cxx

diff --git a/vv/vvToolROIManager.cxx b/vv/vvToolROIManager.cxx
index adaeeb28075d0c3a64d7dd2e017f78daf45b2e89..e1d2e5c534e2f586d45657d3911a14417d6e6641 100644 (file)
--- a/vv/vvToolROIManager.cxx
+++ b/vv/vvToolROIManager.cxx
@@ -299,7 +299,7 @@ void vvToolROIManager::Open()
   QString Extensions = "Images or Dicom-Struct files ( *.mha *.mhd *.hdr *.his *.dcm RS*)";
   Extensions += ";;All Files (*)";
   QStringList filename =
-    QFileDialog::getOpenFileNames(this,tr("Open binary image"),
+    QFileDialog::getOpenFileNames(this,tr("Open binary image or DICOM RT Struct"),
                                  mMainWindowBase->GetInputPathName(),Extensions);
   if (filename.size() == 0) return;
   if (filename.size() > 1) { OpenBinaryImage(filename); return; }
@@ -361,6 +361,7 @@ void vvToolROIManager::OpenDicomImage(std::string filename)
   reader.SetFilename(filename);
   vvStructSelector selector;
   selector.SetStructures(reader.GetROINames());
+  selector.SetPropagationCheckBoxFlag(false);
   
   if (selector.exec()) { 
     vvProgressDialog p("Reading ROI...", true);
@@ -490,9 +491,7 @@ void vvToolROIManager::UpdateAllContours()
   for(unsigned int i=0; i<mROIList.size(); i++) {
     mROIActorsList[i]->Update();
   }
-  for(int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
-    mCurrentSlicerManager->GetSlicer(i)->Render();
-  }
+  mCurrentSlicerManager->Render();
 }
 //------------------------------------------------------------------------------
 
@@ -678,6 +677,8 @@ void vvToolROIManager::ChangeColor() {
                 mCurrentROIActor->GetROI()->GetDisplayColor()[1],
                 mCurrentROIActor->GetROI()->GetDisplayColor()[2]);
   QColor c = QColorDialog::getColor(color, this, "Choose the ROI color");
+  if (!c.isValid()) return;// User cancel
+
   mCurrentROIActor->GetROI()->SetDisplayColor(c.redF(), c.greenF(), c.blueF());
   mCurrentROIActor->UpdateColor();