...

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

diff --git a/lib/cpPlugins/Plugins/IO/ImageReader.cxx b/lib/cpPlugins/Plugins/IO/ImageReader.cxx
index fc747eb7348f910d36a04f936a10a9f8ee43fce4..e18c98709f58f2654e9b6f431a91b07c94941512 100644 (file)
--- a/lib/cpPlugins/Plugins/IO/ImageReader.cxx
+++ b/lib/cpPlugins/Plugins/IO/ImageReader.cxx
@@ -4,50 +4,52 @@
 #include <itkImageFileReader.h>
 #include <itkImageSeriesReader.h>
 
-#ifdef cpPlugins_Interface_QT4
-#include <QFileDialog>
-#endif // cpPlugins_Interface_QT4
+/* TODO
+   #ifdef cpPlugins_Interface_QT4
+   #include <QFileDialog>
+   #endif // cpPlugins_Interface_QT4
 
-// -------------------------------------------------------------------------
-bool cpPlugins::IO::ImageReader::
-ExecConfigurationDialog( QWidget* parent )
-{
-  bool r = false;
+   // -------------------------------------------------------------------------
+   cpPlugins::IO::ImageReader::
+   DialogResult cpPlugins::IO::ImageReader::
+   ExecConfigurationDialog( QWidget* parent )
+   {
+   DialogResult r = Self::DialogResult_Cancel;
 
-#ifdef cpPlugins_Interface_QT4
+   #ifdef cpPlugins_Interface_QT4
 
-  QStringList filters;
-  filters
-    << "Image files (*.bmp *.png *.jpg *.jpeg *.dcm *.mhd *.nhdr *.nrrd *.tiff)"
-    << "Any files (*)";
+   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 ]: ".";
+   TStringList names = this->m_Parameters->GetFileNameList( "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 = true;
+   // 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
+   } // fi
 
-#endif // cpPlugins_Interface_QT4
+   #endif // cpPlugins_Interface_QT4
 
-  return( r );
-}
+   return( r );
+   }
+*/
 
 // -------------------------------------------------------------------------
 cpPlugins::IO::ImageReader::
@@ -56,8 +58,9 @@ ImageReader( )
 {
   this->_MakeOutput< cpPlugins::Interface::Image >( "Output" );
 
-  this->m_Parameters->ConfigureAsStringList( "FileNames" );
-  this->m_Parameters->ConfigureAsBool( "VectorType", false );
+  this->m_Parameters->ConfigureAsFileNameList( "FileNames" );
+  this->m_Parameters->ConfigureAsBool( "VectorType" );
+  this->m_Parameters->SetBool( "VectorType", false );
 }
 
 // -------------------------------------------------------------------------
@@ -71,8 +74,7 @@ std::string cpPlugins::IO::ImageReader::
 _GenerateData( )
 {
   // Get filenames
-  TStringList names;
-  this->m_Parameters->GetStringList( names, "FileNames" );
+  TStringList names = this->m_Parameters->GetFileNameList( "FileNames" );
 
   std::string r = "";
   if( names.size( ) >= 1 )
@@ -105,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 );
 }