Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins

[cpPlugins.git] / lib / cpPlugins / Plugins / IO / DicomSeriesReader.cxx

diff --git a/lib/cpPlugins/Plugins/IO/DicomSeriesReader.cxx b/lib/cpPlugins/Plugins/IO/DicomSeriesReader.cxx
index e915fcf58e4c746881cd0a655e929309ad4c8e04..e2aeb31b51f2bacb8faf5602d77e0f96d5a4265f 100644 (file)
--- a/lib/cpPlugins/Plugins/IO/DicomSeriesReader.cxx
+++ b/lib/cpPlugins/Plugins/IO/DicomSeriesReader.cxx
@@ -20,10 +20,11 @@
 #include <itkGDCMSeriesFileNames.h>
 
 // -------------------------------------------------------------------------
-bool cpPlugins::IO::DicomSeriesReader::
+cpPlugins::IO::DicomSeriesReader::
+DialogResult cpPlugins::IO::DicomSeriesReader::
 ExecConfigurationDialog( QWidget* parent )
 {
-  bool r = false;
+  DialogResult r = Self::DialogResult_Cancel;
 
 #ifdef cpPlugins_Interface_QT4
 
@@ -37,7 +38,7 @@ ExecConfigurationDialog( QWidget* parent )
   dialog.setFileMode( QFileDialog::DirectoryOnly );
   dialog.setDirectory( QFileDialog::tr( "." ) );
   if( !dialog.exec( ) )
-    return( false );
+    return( Self::DialogResult_Cancel );
 
   // Prepare dialog
   QApplication::setOverrideCursor( Qt::WaitCursor );
@@ -119,7 +120,7 @@ ExecConfigurationDialog( QWidget* parent )
   {
     delete tree_widget;
     delete tree_dialog;
-    return( false );
+    return( Self::DialogResult_Cancel );
 
   } // fi
 
@@ -149,7 +150,7 @@ ExecConfigurationDialog( QWidget* parent )
     parent->setEnabled( true );
 
   if( tree_dialog->exec( ) == 0 )
-    return( false );
+    return( Self::DialogResult_Cancel );
 
   QTreeWidgetItem* item = tree_widget->currentItem( );
   if( item != NULL )
@@ -169,7 +170,7 @@ ExecConfigurationDialog( QWidget* parent )
       for( unsigned int f = 0; f < names.size( ); ++f )
         this->m_Parameters->AddToStringList( "FileNames", names[ f ] );
 
-      r = true;
+      r = Self::DialogResult_NoModal;
 
       QApplication::restoreOverrideCursor( );
       if( parent != NULL )