X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=plugins%2FIO%2FImageReader.cxx;h=ffd3e8b807642fe871d3f14a32831eea14737a79;hb=560b80db4e0253bef4a1b7ff3afb63fd04591551;hp=0402e9e4a865ffb62c358ca053d86e7603fda7d3;hpb=3393941bf8f26babc7b592db434b40c1b747a687;p=cpPlugins.git

diff --git a/plugins/IO/ImageReader.cxx b/plugins/IO/ImageReader.cxx
index 0402e9e..ffd3e8b 100644
--- a/plugins/IO/ImageReader.cxx
+++ b/plugins/IO/ImageReader.cxx
@@ -1,80 +1,13 @@
-#include <plugins/IO/ImageReader.h>
-#include <plugins/IO/ImageReaderQDialog.h>
+#include <IO/ImageReader.h>
 #include <cpPlugins/DataObjects/Image.h>
+#include <cpPlugins/QT/OpenFileDialog.h>
 
 #include <itkImageFileReader.h>
 #include <itkImageSeriesReader.h>
-
-#include <itkImageFileReader.hxx>
-#include <itkImageSeriesReader.hxx>
-#include <itkConvertPixelBuffer.hxx>
-#include <itkImageAlgorithm.hxx>
-#include <itkSimpleDataObjectDecorator.hxx>
+#include <itkImageIOFactory.h>
 
 #ifdef cpPlugins_QT4
-
-#include <QApplication>
-#include <QFileInfo>
-
-// -------------------------------------------------------------------------
-cpPluginsIO::ImageReaderQDialog::
-ImageReaderQDialog( QWidget* parent )
-  : QFileDialog( parent ),
-    m_ProcessObject( NULL )
-{
-  this->connect(
-    this, SIGNAL( accepted( ) ), this, SLOT( _dlg_Accepted( ) )
-    );
-  this->setWindowTitle( "Open an(some) image(s)" );
-}
-
-// -------------------------------------------------------------------------
-cpPluginsIO::ImageReaderQDialog::
-~ImageReaderQDialog( )
-{
-}
-
-// -------------------------------------------------------------------------
-void cpPluginsIO::ImageReaderQDialog::
-setProcessObject( cpPlugins::BaseObjects::ProcessObject* obj )
-{
-  if( obj == NULL )
-    return;
-  this->m_ProcessObject = obj;
-  auto param = this->m_ProcessObject->GetParameters( );
-  auto extensions = param->GetAcceptedFileExtensions( "FileNames" );
-  auto files = param->GetOpenFileNameList( "FileNames" );
-
-  QStringList filters;
-  if( extensions != "" )
-    filters << extensions.c_str( );
-  filters << "Any file (*)";
-  this->setFileMode( QFileDialog::ExistingFiles );
-  this->setNameFilters( filters );
-  this->setAcceptMode( QFileDialog::AcceptOpen );
-  if( files.size( ) > 0 )
-  {
-    QFileInfo info( files[ 0 ].c_str( ) );
-    this->setDirectory( info.canonicalPath( ) );
-
-  } // fi
-}
-
-// -------------------------------------------------------------------------
-void cpPluginsIO::ImageReaderQDialog::
-_dlg_Accepted( )
-{
-  if( this->m_ProcessObject != NULL )
-  {
-    auto param = this->m_ProcessObject->GetParameters( );
-    auto files = this->selectedFiles( );
-    param->ClearOpenFileNameList( "FileNames" );
-    for( auto fIt = files.begin( ); fIt != files.end( ); ++fIt )
-      param->AddToOpenFileNameList( "FileNames", fIt->toStdString( ) );
-
-  } // fi
-}
-
+#  include <QApplication>
 #endif // cpPlugins_QT4
 
 // -------------------------------------------------------------------------
@@ -82,11 +15,11 @@ QDialog* cpPluginsIO::ImageReader::
 CreateQDialog( )
 {
 #ifdef cpPlugins_QT4
-  ImageReaderQDialog* dlg = NULL;
+  cpPlugins::QT::OpenFileDialog* dlg = NULL;
   if( QApplication::instance( ) != NULL )
   {
-    dlg = new ImageReaderQDialog( );
-    dlg->setProcessObject( this );
+    dlg = new cpPlugins::QT::OpenFileDialog( );
+    dlg->SetParameters( &( this->m_Parameters ), "FileNames" );
 
   } // fi
   return( dlg );
@@ -121,32 +54,37 @@ _GenerateData( )
 {
   // Get filenames
   auto fnames = this->m_Parameters.GetOpenFileNameList( "FileNames" );
-  if( fnames.size( ) >= 1 )
+  if( fnames.size( ) > 1 )
   {
+    std::stringstream fname_str;
+    fname_str << fnames[ 0 ] << cpPlugins_PATH_SEPARATOR << fnames[ 1 ];
+    std::string fname = fname_str.str( );
+
     // Guess image properties
     itk::ImageIOBase::Pointer io =
       itk::ImageIOFactory::CreateImageIO(
-        fnames[ 0 ].c_str( ),
-        itk::ImageIOFactory::ReadMode
+        fname.c_str( ), itk::ImageIOFactory::ReadMode
         );
     if( io.IsNotNull( ) )
     {
-      io->SetFileName( fnames[ 0 ] );
+      io->SetFileName( fname );
       io->ReadImageInformation( );
-      if( fnames.size( ) >= 1 )
-      {
-        switch( io->GetNumberOfDimensions( ) )
-        {
-        case 1: this->_GD0< 1 >( io ); break;
-        case 2: this->_GD0< 2 >( io ); break;
-        case 3: this->_GD0< 3 >( io ); break;
-        case 4: this->_GD0< 4 >( io ); break;
-        default:
-          this->_Error( "Image dimension not supported." );
-          break;
-        } // hctiws
-
-      } // fi
+      bool success = false;
+      unsigned int dim = io->GetNumberOfDimensions( );
+#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_1
+      if( dim == 1 ) success = this->_GD0< 1 >( io );
+#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_1
+#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_2
+      if( dim == 2 ) success = this->_GD0< 2 >( io );
+#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_2
+#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_3
+      if( dim == 3 ) success = this->_GD0< 3 >( io );
+#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_3
+#ifdef cpPlugins_CONFIG_PROCESS_DIMENSIONS_4
+      if( dim == 4 ) success = this->_GD0< 4 >( io );
+#endif // cpPlugins_CONFIG_PROCESS_DIMENSIONS_4
+      if( !success )
+        this->_Error( "Image dimension not supported." );
     }
     else
       this->_Error(
@@ -161,7 +99,7 @@ _GenerateData( )
 
 // -------------------------------------------------------------------------
 template< unsigned int _Dim >
-void cpPluginsIO::ImageReader::
+bool cpPluginsIO::ImageReader::
 _GD0( itk::ImageIOBase* io )
 {
   typedef unsigned char  uchar;
@@ -172,124 +110,153 @@ _GD0( itk::ImageIOBase* io )
   itk::ImageIOBase::IOComponentType ct = io->GetComponentType( );
   itk::ImageIOBase::IOPixelType pt = io->GetPixelType( );
 
+  bool success = false;
   if( pt == itk::ImageIOBase::SCALAR )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::CHAR   : this->_GD1<   char, _Dim >( io ); break;
-    case itk::ImageIOBase::SHORT  : this->_GD1<  short, _Dim >( io ); break;
-    case itk::ImageIOBase::INT    : this->_GD1<    int, _Dim >( io ); break;
-    case itk::ImageIOBase::LONG   : this->_GD1<   long, _Dim >( io ); break;
-    case itk::ImageIOBase::FLOAT  : this->_GD1<  float, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< double, _Dim >( io ); break;
-    case itk::ImageIOBase::UCHAR  : this->_GD1<  uchar, _Dim >( io ); break;
-    case itk::ImageIOBase::USHORT : this->_GD1< ushort, _Dim >( io ); break;
-    case itk::ImageIOBase::UINT   : this->_GD1<   uint, _Dim >( io ); break;
-    case itk::ImageIOBase::ULONG  : this->_GD1<  ulong, _Dim >( io ); break;
-    default: this->_Error( "Scalar pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
+    if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< char, _Dim >( io );
+    if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< uchar, _Dim >( io );
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_char
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
+    if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< short, _Dim >( io );
+    if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< ushort, _Dim >( io );
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_short
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
+    if( ct == itk::ImageIOBase::INT ) success = this->_GD1< int, _Dim >( io );
+    if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< uint, _Dim >( io );
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_int
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
+    if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< long, _Dim >( io );
+    if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< ulong, _Dim >( io );
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_long
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< float, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< double, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::RGB )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::CHAR   : this->_GD1< itk::RGBPixel<   char >, _Dim >( io ); break;
-    case itk::ImageIOBase::SHORT  : this->_GD1< itk::RGBPixel<  short >, _Dim >( io ); break;
-    case itk::ImageIOBase::INT    : this->_GD1< itk::RGBPixel<    int >, _Dim >( io ); break;
-    case itk::ImageIOBase::LONG   : this->_GD1< itk::RGBPixel<   long >, _Dim >( io ); break;
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::RGBPixel<  float >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::RGBPixel< double >, _Dim >( io ); break;
-    case itk::ImageIOBase::UCHAR  : this->_GD1< itk::RGBPixel<  uchar >, _Dim >( io ); break;
-    case itk::ImageIOBase::USHORT : this->_GD1< itk::RGBPixel< ushort >, _Dim >( io ); break;
-    case itk::ImageIOBase::UINT   : this->_GD1< itk::RGBPixel<   uint >, _Dim >( io ); break;
-    case itk::ImageIOBase::ULONG  : this->_GD1< itk::RGBPixel<  ulong >, _Dim >( io ); break;
-    default: this->_Error( "RGB pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
+    if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< itk::RGBPixel< char >, _Dim >( io );
+    if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< itk::RGBPixel< uchar >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_char
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
+    if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< itk::RGBPixel< short >, _Dim >( io );
+    if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< itk::RGBPixel< ushort >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_short
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
+    if( ct == itk::ImageIOBase::INT ) success = this->_GD1< itk::RGBPixel< int >, _Dim >( io );
+    if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< itk::RGBPixel< uint >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_int
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
+    if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< itk::RGBPixel< long >, _Dim >( io );
+    if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< itk::RGBPixel< ulong >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_long
+#  ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::RGBPixel< float >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_REAL_TYPES_float
+#  ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::RGBPixel< double >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_REAL_TYPES_double
+#endif // cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
   }
   else if( pt == itk::ImageIOBase::RGBA )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::CHAR   : this->_GD1< itk::RGBAPixel<   char >, _Dim >( io ); break;
-    case itk::ImageIOBase::SHORT  : this->_GD1< itk::RGBAPixel<  short >, _Dim >( io ); break;
-    case itk::ImageIOBase::INT    : this->_GD1< itk::RGBAPixel<    int >, _Dim >( io ); break;
-    case itk::ImageIOBase::LONG   : this->_GD1< itk::RGBAPixel<   long >, _Dim >( io ); break;
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::RGBAPixel<  float >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::RGBAPixel< double >, _Dim >( io ); break;
-    case itk::ImageIOBase::UCHAR  : this->_GD1< itk::RGBAPixel<  uchar >, _Dim >( io ); break;
-    case itk::ImageIOBase::USHORT : this->_GD1< itk::RGBAPixel< ushort >, _Dim >( io ); break;
-    case itk::ImageIOBase::UINT   : this->_GD1< itk::RGBAPixel<   uint >, _Dim >( io ); break;
-    case itk::ImageIOBase::ULONG  : this->_GD1< itk::RGBAPixel<  ulong >, _Dim >( io ); break;
-    default: this->_Error( "RGBA pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
+    if( ct == itk::ImageIOBase::CHAR ) success = this->_GD1< itk::RGBAPixel< char >, _Dim >( io );
+    if( ct == itk::ImageIOBase::UCHAR ) success = this->_GD1< itk::RGBAPixel< uchar >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_char
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
+    if( ct == itk::ImageIOBase::SHORT ) success = this->_GD1< itk::RGBAPixel< short >, _Dim >( io );
+    if( ct == itk::ImageIOBase::USHORT ) success = this->_GD1< itk::RGBAPixel< ushort >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_short
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
+    if( ct == itk::ImageIOBase::INT ) success = this->_GD1< itk::RGBAPixel< int >, _Dim >( io );
+    if( ct == itk::ImageIOBase::UINT ) success = this->_GD1< itk::RGBAPixel< uint >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_int
+#  ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
+    if( ct == itk::ImageIOBase::LONG ) success = this->_GD1< itk::RGBAPixel< long >, _Dim >( io );
+    if( ct == itk::ImageIOBase::ULONG ) success = this->_GD1< itk::RGBAPixel< ulong >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_INTEGER_TYPES_long
+#  ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::RGBAPixel< float >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_REAL_TYPES_float
+#  ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< itk::RGBAPixel< double >, _Dim >( io );
+#  endif // cpPlugins_CONFIG_REAL_TYPES_double
+#endif // cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
   }
   else if( pt == itk::ImageIOBase::COMPLEX )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::FLOAT  : this->_GD1< std::complex< float >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< std::complex< double >, _Dim >( io ); break;
-    default: this->_Error( "Complex pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< std::complex< float >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::DOUBLE ) success = this->_GD1< std::complex< double >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::COVARIANTVECTOR )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::CovariantVector< float, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::CovariantVector< double, _Dim >, _Dim >( io ); break;
-    default: this->_Error( "CovariantVector pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::CovariantVector< float, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::CovariantVector< double, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::POINT )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::Point< float, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::Point< double, _Dim >, _Dim >( io ); break;
-    default: this->_Error( "Point pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Point< float, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Point< double, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::VECTOR )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::Vector< float, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::Vector< double, _Dim >, _Dim >( io ); break;
-    default: this->_Error( "Vector pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Vector< float, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Vector< double, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::SYMMETRICSECONDRANKTENSOR )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::SymmetricSecondRankTensor< float, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::SymmetricSecondRankTensor< double, _Dim >, _Dim >( io ); break;
-    default: this->_Error( "SymmetricSecondRankTensor pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::SymmetricSecondRankTensor< float, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::SymmetricSecondRankTensor< double, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::DIFFUSIONTENSOR3D )
   {
     if( _Dim == 3 )
     {
-      switch( ct )
-      {
-      case itk::ImageIOBase::FLOAT  : this->_GD1< itk::DiffusionTensor3D< float >, 3 >( io ); break;
-      case itk::ImageIOBase::DOUBLE : this->_GD1< itk::DiffusionTensor3D< double >, 3 >( io ); break;
-      default: this->_Error( "DiffusionTensor3D pixel type not supported." ); break;
-      } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+      if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::DiffusionTensor3D< float >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+      if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::DiffusionTensor3D< double >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
     }
     else
       this->_Error( "DiffusionTensor3D dimension not supported." );
   }
   else if( pt == itk::ImageIOBase::MATRIX )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::Matrix< float, _Dim, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::Matrix< double, _Dim, _Dim >, _Dim >( io ); break;
-    default: this->_Error( "Matrix pixel type not supported." ); break;
-    } // hctiws
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Matrix< float, _Dim, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
+    if( ct == itk::ImageIOBase::FLOAT ) success = this->_GD1< itk::Matrix< double, _Dim, _Dim >, _Dim >( io );
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   }
   else if( pt == itk::ImageIOBase::OFFSET )
   {
@@ -297,64 +264,60 @@ _GD0( itk::ImageIOBase* io )
   }
   else if( pt == itk::ImageIOBase::FIXEDARRAY )
   {
-    switch( ct )
-    {
-    case itk::ImageIOBase::CHAR   : this->_GD1< itk::FixedArray<   char, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::SHORT  : this->_GD1< itk::FixedArray<  short, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::INT    : this->_GD1< itk::FixedArray<    int, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::LONG   : this->_GD1< itk::FixedArray<   long, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::FLOAT  : this->_GD1< itk::FixedArray<  float, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::DOUBLE : this->_GD1< itk::FixedArray< double, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::UCHAR  : this->_GD1< itk::FixedArray<  uchar, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::USHORT : this->_GD1< itk::FixedArray< ushort, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::UINT   : this->_GD1< itk::FixedArray<   uint, _Dim >, _Dim >( io ); break;
-    case itk::ImageIOBase::ULONG  : this->_GD1< itk::FixedArray<  ulong, _Dim >, _Dim >( io ); break;
-    default: this->_Error( "Scalar pixel type not supported." ); break;
-    } // hctiws
-  }
-  else
-    this->_Error( "Image pixel type not yet supported." );
+  } // fi
+  return( success );
 }
 
 // -------------------------------------------------------------------------
 template< class _TPixel, unsigned int _Dim >
-void cpPluginsIO::ImageReader::
+bool cpPluginsIO::ImageReader::
 _GD1( itk::ImageIOBase* io )
 {
   typedef itk::Image< _TPixel, _Dim > _TImage;
 
   // Get filenames
   auto fnames = this->m_Parameters.GetOpenFileNameList( "FileNames" );
-  if( fnames.size( ) == 1 )
+  if( fnames.size( ) == 2 )
   {
+    std::stringstream fname_str;
+    fname_str << fnames[ 0 ] << cpPlugins_PATH_SEPARATOR << fnames[ 1 ];
+
     auto f = this->_CreateITK< itk::ImageFileReader< _TImage > >( );
-    f->SetFileName( fnames[ 0 ] );
+    f->SetFileName( fname_str.str( ) );
     f->SetImageIO( io );
     try
     {
       f->Update( );
       this->GetOutput( "Output" )->SetITK( f->GetOutput( ) );
+      return( true );
     }
     catch( itk::ExceptionObject& err )
     {
       this->_Error( err.GetDescription( ) );
+      return( false );
 
     } // yrt
   }
   else // if( fnames.size( ) > 1 )
   {
     auto f = this->_CreateITK< itk::ImageSeriesReader< _TImage > >( );
-    for( auto i = fnames.begin( ); i != fnames.end( ); ++i )
-      f->AddFileName( *i );
+    auto i = fnames.begin( );
+    std::stringstream dir;
+    dir << *i << cpPlugins_PATH_SEPARATOR;
+    i++;
+    for( ; i != fnames.end( ); ++i )
+      f->AddFileName( dir.str( ) + *i );
     f->SetImageIO( io );
     try
     {
       f->Update( );
       this->GetOutput( "Output" )->SetITK( f->GetOutput( ) );
+      return( true );
     }
     catch( itk::ExceptionObject& err )
     {
       this->_Error( err.GetDescription( ) );
+      return( false );
 
     } // yrt