X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FIO%2FImageReader.cxx;h=17744fa4e38a48c5a1007c54800476b785a1f02d;hb=83e946f1e96c001dde06a2785473d08468e28b2e;hp=f544617e4685aa3245c144ee78a78f883c6493fe;hpb=f9ab41413f58223ff4c616022e1ca4f3cccad21e;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/IO/ImageReader.cxx b/lib/cpPlugins/Plugins/IO/ImageReader.cxx
index f544617..17744fa 100644
--- a/lib/cpPlugins/Plugins/IO/ImageReader.cxx
+++ b/lib/cpPlugins/Plugins/IO/ImageReader.cxx
@@ -1,8 +1,6 @@
 #include "ImageReader.h"
 #include <cpPlugins/Interface/Image.h>
 
-#include <set>
-
 #include <itkImageFileReader.h>
 #include <itkImageSeriesReader.h>
 
@@ -11,10 +9,11 @@
 #endif // cpPlugins_Interface_QT4
 
 // -------------------------------------------------------------------------
-bool cpPlugins::IO::ImageReader::
+cpPlugins::IO::ImageReader::
+DialogResult cpPlugins::IO::ImageReader::
 ExecConfigurationDialog( QWidget* parent )
 {
-  bool r = false;
+  DialogResult r = Self::DialogResult_Cancel;
 
 #ifdef cpPlugins_Interface_QT4
 
@@ -32,6 +31,7 @@ ExecConfigurationDialog( QWidget* parent )
   dialog.setFileMode( QFileDialog::ExistingFiles );
   dialog.setDirectory( QFileDialog::tr( name.c_str( ) ) );
   dialog.setNameFilters( filters );
+  dialog.setAcceptMode( QFileDialog::AcceptOpen );
   if( dialog.exec( ) )
   {
     QStringList names = dialog.selectedFiles( );
@@ -41,7 +41,7 @@ ExecConfigurationDialog( QWidget* parent )
         "FileNames", qIt->toStdString( )
         );
     this->m_Parameters->SetBool( "VectorType", false );
-    r = true;
+    r = Self::DialogResult_NoModal;
 
   } // fi
 
@@ -58,7 +58,8 @@ ImageReader( )
   this->_MakeOutput< cpPlugins::Interface::Image >( "Output" );
 
   this->m_Parameters->ConfigureAsStringList( "FileNames" );
-  this->m_Parameters->ConfigureAsBool( "VectorType", false );
+  this->m_Parameters->ConfigureAsBool( "VectorType" );
+  this->m_Parameters->SetBool( "VectorType", false );
 }
 
 // -------------------------------------------------------------------------
@@ -106,7 +107,7 @@ _GenerateData( )
       r = "ImageReader: Could not CreateImageIO for \"" + names[ 0 ] + "\"";
   }
   else
-    r = "No image files given";
+    r = "ImageReader: No image files given";
   return( r );
 }
 
@@ -388,20 +389,15 @@ _RealGD( const TStringList& names )
   else if( names.size( ) > 1 )
   {
     // Read image series
-    std::set< std::string > ordered_names;
-    for( unsigned int i = 0; i < names.size( ); ++i )
-      ordered_names.insert( names[ i ] );
-
     typedef itk::ImageSeriesReader< I > _MR;
     _MR* reader = this->_CreateITK< _MR >( );
-    std::set< std::string >::const_iterator fnIt = ordered_names.begin( );
-    for( ; fnIt != ordered_names.end( ); ++fnIt )
-      reader->AddFileName( *fnIt );
+    for( unsigned int i = 0; i < names.size( ); ++i )
+      reader->AddFileName( names[ i ] );
     try
     {
       reader->Update( );
       out->SetITK< I >( reader->GetOutput( ) );
-      out->SetName( *( ordered_names.begin( ) ) );
+      out->SetName( names[ 0 ] );
     }
     catch( itk::ExceptionObject& err )
     {