vtkPolyData support added

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

diff --git a/lib/cpPlugins/Plugins/ImageReader.cxx b/lib/cpPlugins/Plugins/ImageReader.cxx
index aa7be8e6ce9c1d1c1f0b8b3cb55f3676d4d4f082..da7b949485bcb72e7bb9947b3a63df4dd88f1ea7 100644 (file)
--- a/lib/cpPlugins/Plugins/ImageReader.cxx
+++ b/lib/cpPlugins/Plugins/ImageReader.cxx
@@ -2,6 +2,7 @@
 #include <cpPlugins/Interface/Image.h>
 
 #include <itkImageFileReader.h>
+#include <itkImageSeriesReader.h>
 
 #define ITK_MANUAL_INSTANTIATION
 #include <itkImage.h>
@@ -23,7 +24,7 @@ ImageReader( )
   this->_MakeOutput< cpPlugins::Interface::Image >( 0 );
 
   using namespace cpPlugins::Interface;
-  this->m_DefaultParameters.Configure( Parameters::String, "FileName" );
+  this->m_DefaultParameters.Configure( Parameters::StringList, "FileNames" );
   this->m_DefaultParameters.Configure( Parameters::String, "PixelType" );
   this->m_DefaultParameters.Configure( Parameters::Uint, "Dimension" );
   this->m_DefaultParameters.Configure( Parameters::Uint, "IsColorImage" );
@@ -118,35 +119,82 @@ template< class P, unsigned int D >
 std::string cpPlugins::Plugins::ImageReader::
 _GD1( )
 {
-  // Get filename
-  using namespace cpPlugins::Interface;
-  Parameters::TString fname =
-    this->m_Parameters.GetValueAsString( "FileName" );
-
   typedef itk::Image< P, D > _TImage;
-  typedef itk::ImageFileReader< _TImage > _TReader;
 
-  _TReader* reader =
-    dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
-  if( reader == NULL )
-  {
-    this->m_RealProcessObject = _TReader::New( );
-    reader =
-      dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
+  // Get filenames
+  using namespace cpPlugins::Interface;
+  std::vector< Parameters::TString > unordered_names;
+  this->m_Parameters.GetValueAsStringList( unordered_names, "FileNames" );
 
-  } // fi
-  reader->SetFileName( fname );
-  try
+  if( unordered_names.size( ) == 1 )
   {
-    reader->Update( );
+    // Read single image
+    typedef itk::ImageFileReader< _TImage > _TSingleReader;
+
+    _TSingleReader* singleReader =
+      dynamic_cast< _TSingleReader* >(
+        this->m_RealProcessObject.GetPointer( )
+        );
+    if( singleReader == NULL )
+    {
+      this->m_RealProcessObject = _TSingleReader::New( );
+      singleReader =
+        dynamic_cast< _TSingleReader* >(
+          this->m_RealProcessObject.GetPointer( )
+          );
+
+    } // fi
+    singleReader->SetFileName( unordered_names.front( ) );
+    try
+    {
+      singleReader->Update( );
+    }
+    catch( itk::ExceptionObject& err )
+    {
+      return( err.GetDescription( ) );
+
+    } // yrt
+    this->_SetOutput( 0, singleReader->GetOutput( ) );
+    return( "" );
   }
-  catch( itk::ExceptionObject& err )
+  else if( unordered_names.size( ) > 1 )
   {
-    return( err.GetDescription( ) );
-
-  } // yrt
-  this->_SetOutput( 0, reader->GetOutput( ) );
-  return( "" );
+    // Read image series
+    std::set< std::string > ordered_names;
+    for( unsigned int i = 0; i < unordered_names.size( ); ++i )
+      ordered_names.insert( unordered_names[ i ] );
+
+    typedef itk::ImageSeriesReader< _TImage > _TMultiReader;
+    _TMultiReader* multiReader =
+      dynamic_cast< _TMultiReader* >(
+        this->m_RealProcessObject.GetPointer( )
+        );
+    if( multiReader == NULL )
+    {
+      this->m_RealProcessObject = _TMultiReader::New( );
+      multiReader =
+        dynamic_cast< _TMultiReader* >(
+          this->m_RealProcessObject.GetPointer( )
+          );
+
+    } // fi
+    std::set< std::string >::const_iterator fnIt = ordered_names.begin( );
+    for( ; fnIt != ordered_names.end( ); ++fnIt )
+      multiReader->AddFileName( *fnIt );
+    try
+    {
+      multiReader->Update( );
+    }
+    catch( itk::ExceptionObject& err )
+    {
+      return( err.GetDescription( ) );
+
+    } // yrt
+    this->_SetOutput( 0, multiReader->GetOutput( ) );
+    return( "" );
+  }
+  else
+    return( "No image filename(s) given." );
 }
 
 // eof - $RCSfile$