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

diff --git a/lib/cpPlugins/Plugins/IO/ImageReader.cxx b/lib/cpPlugins/Plugins/IO/ImageReader.cxx
index 17744fa..cd0d6c9 100644
--- a/lib/cpPlugins/Plugins/IO/ImageReader.cxx
+++ b/lib/cpPlugins/Plugins/IO/ImageReader.cxx
@@ -4,62 +4,20 @@
 #include <itkImageFileReader.h>
 #include <itkImageSeriesReader.h>
 
-#ifdef cpPlugins_Interface_QT4
-#include <QFileDialog>
-#endif // cpPlugins_Interface_QT4
-
-// -------------------------------------------------------------------------
-cpPlugins::IO::ImageReader::
-DialogResult cpPlugins::IO::ImageReader::
-ExecConfigurationDialog( QWidget* parent )
-{
-  DialogResult r = Self::DialogResult_Cancel;
-
-#ifdef cpPlugins_Interface_QT4
-
-  QStringList filters;
-  filters
-    << "Image files (*.bmp *.png *.jpg *.jpeg *.dcm *.mhd *.nhdr *.nrrd *.tiff)"
-    << "Any files (*)";
-
-  std::vector< std::string > names;
-  this->m_Parameters->GetStringList( names, "FileNames" );
-  std::string name = ( names.size( ) > 0 )? names[ 0 ]: ".";
-
-  // Show dialog and check if it was accepted
-  QFileDialog dialog( 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( );
-    QStringList::const_iterator qIt = names.begin( );
-    for( ; qIt != names.end( ); ++qIt )
-      this->m_Parameters->AddToStringList(
-        "FileNames", qIt->toStdString( )
-        );
-    this->m_Parameters->SetBool( "VectorType", false );
-    r = Self::DialogResult_NoModal;
-
-  } // fi
-
-#endif // cpPlugins_Interface_QT4
-
-  return( r );
-}
-
 // -------------------------------------------------------------------------
 cpPlugins::IO::ImageReader::
 ImageReader( )
   : Superclass( )
 {
-  this->_MakeOutput< cpPlugins::Interface::Image >( "Output" );
+  this->_AddOutput< cpPlugins::Interface::Image >( "Output" );
 
-  this->m_Parameters->ConfigureAsStringList( "FileNames" );
+  this->m_Parameters->ConfigureAsOpenFileNameList( "FileNames" );
   this->m_Parameters->ConfigureAsBool( "VectorType" );
   this->m_Parameters->SetBool( "VectorType", false );
+  this->m_Parameters->SetAcceptedFileExtensions(
+    "FileNames",
+    "Image files (*.bmp *.png *.jpg *.jpeg *.dcm *.mhd *.nhdr *.nrrd *.tiff)"
+    );
 }
 
 // -------------------------------------------------------------------------
@@ -73,8 +31,7 @@ std::string cpPlugins::IO::ImageReader::
 _GenerateData( )
 {
   // Get filenames
-  TStringList names;
-  this->m_Parameters->GetStringList( names, "FileNames" );
+  TStringList names = this->m_Parameters->GetOpenFileNameList( "FileNames" );
 
   std::string r = "";
   if( names.size( ) >= 1 )
@@ -360,8 +317,7 @@ template< class I >
 std::string cpPlugins::IO::ImageReader::
 _RealGD( const TStringList& names )
 {
-  cpPlugins::Interface::Image* out =
-    this->GetOutput< cpPlugins::Interface::Image >( "Output" );
+  auto out = this->GetOutputData< cpPlugins::Interface::Image >( "Output" );
   if( out == NULL )
     return( "ImageReader: No output object properly created." );