Add progress dialog for binary images

diff --git a/vv/vvToolROIManager.cxx b/vv/vvToolROIManager.cxx
index b6784004958c433a88d27756f6476dcbd4d68d24..adaeeb28075d0c3a64d7dd2e017f78daf45b2e89 100644 (file)
--- a/vv/vvToolROIManager.cxx
+++ b/vv/vvToolROIManager.cxx
@@ -318,17 +318,21 @@ void vvToolROIManager::OpenBinaryImage(QStringList & filename)
 {
   if (filename.size() == 0) return;
   
 {
   if (filename.size() == 0) return;
   

+  vvProgressDialog p("Reading ROI ...", true);
+  p.SetCancelButtonEnabled(false);
+  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+  

   // For each selected file, open the image
   // For each selected file, open the image

-  for(int i=0; i<filename.size(); i++) {
+  for(int i=0; i<filename.size(); i++) { 
+    p.SetProgress(i, filename.size());
+

     // Open Image
     // Open Image

-    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));

     vvImageReader::Pointer reader = vvImageReader::New();
     std::vector<std::string> filenames;
     filenames.push_back(filename[i].toStdString());
     reader->SetInputFilenames(filenames);
     reader->Update(vvImageReader::IMAGE);
     vvImageReader::Pointer reader = vvImageReader::New();
     std::vector<std::string> filenames;
     filenames.push_back(filename[i].toStdString());
     reader->SetInputFilenames(filenames);
     reader->Update(vvImageReader::IMAGE);

-    QApplication::restoreOverrideCursor();
-
+  

     if (reader->GetLastError().size() != 0) {
       std::cerr << "Error while reading " << filename[i].toStdString() << std::endl;
       QString error = "Cannot open file \n";
     if (reader->GetLastError().size() != 0) {
       std::cerr << "Error while reading " << filename[i].toStdString() << std::endl;
       QString error = "Cannot open file \n";


@@ -341,6 +345,7 @@ void vvToolROIManager::OpenBinaryImage(QStringList & filename)
              (!mBGModeCheckBox->isChecked()));
     mOpenedBinaryImageFilenames.push_back(filename[i]);
   }
              (!mBGModeCheckBox->isChecked()));
     mOpenedBinaryImageFilenames.push_back(filename[i]);
   }

+  QApplication::restoreOverrideCursor();

 
   // Update the contours
   UpdateAllContours(); 
 
   // Update the contours
   UpdateAllContours(); 


@@ -357,11 +362,10 @@ void vvToolROIManager::OpenDicomImage(std::string filename)
   vvStructSelector selector;
   selector.SetStructures(reader.GetROINames());
   
   vvStructSelector selector;
   selector.SetStructures(reader.GetROINames());
   

-  if (selector.exec()) {
-    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-    
+  if (selector.exec()) { 

     vvProgressDialog p("Reading ROI...", true);
     p.SetCancelButtonEnabled(false);
     vvProgressDialog p("Reading ROI...", true);
     p.SetCancelButtonEnabled(false);

+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));

 
     // Read information
     clitk::DicomRT_StructureSet::Pointer s = clitk::DicomRT_StructureSet::New();
 
     // Read information
     clitk::DicomRT_StructureSet::Pointer s = clitk::DicomRT_StructureSet::New();