X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FImageSeriesReader.cxx;h=30585e77182595dfaf498fc590506c8a2c2cf789;hb=05b92946cf3e01d93bdf5f317df943baaac9ebda;hp=d6fbfa6487919be026847a3591ff28c97e1ea3ab;hpb=cb833d2fface96e020fe91584d2206860a8174ee;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/ImageSeriesReader.cxx b/lib/cpPlugins/Plugins/ImageSeriesReader.cxx
index d6fbfa6..30585e7 100644
--- a/lib/cpPlugins/Plugins/ImageSeriesReader.cxx
+++ b/lib/cpPlugins/Plugins/ImageSeriesReader.cxx
@@ -25,11 +25,15 @@ ImageSeriesReader( )
   this->SetNumberOfOutputs( 1 );
   this->_MakeOutput< cpPlugins::Interface::Image >( 0 );
 
-  this->m_DefaultParameters[ "FileNames" ] =
-    TParameter( "string", "file_name1;file_name2;file_name3;..." );
-  this->m_DefaultParameters[ "PixelType" ] = TParameter( "type", "uchar" );
-  this->m_DefaultParameters[ "ImageDimension" ] = TParameter( "int", "3" );
-  this->m_DefaultParameters[ "IsColorImage" ] = TParameter( "bool", "0" );
+  using namespace cpPlugins::Interface;
+  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" );
+  this->m_DefaultParameters.SetValueAsString( "PixelType", "uchar" );
+  this->m_DefaultParameters.SetValueAsUint( "Dimension", 3 );
+  this->m_DefaultParameters.SetValueAsUint( "IsColorImage", 0 );
+  this->m_Parameters = this->m_DefaultParameters;
 }
 
 // -------------------------------------------------------------------------
@@ -42,17 +46,13 @@ cpPlugins::Plugins::ImageSeriesReader::
 std::string cpPlugins::Plugins::ImageSeriesReader::
 _GenerateData( )
 {
-  TParameters::const_iterator dIt;
-
-  // Get image dimension
-  dIt = this->m_Parameters.find( "ImageDimension" );
-  if( dIt == this->m_Parameters.end( ) )
-    dIt = this->m_DefaultParameters.find( "ImageDimension" );
+  using namespace cpPlugins::Interface;
+  Parameters::TUint dim = this->m_Parameters.GetValueAsUint( "Dimension" );
 
   std::string r = "cpPlugins::Plugins::ImageSeriesReader: itk::Image dimension not supported.";
-  if( dIt->second.second == "2" ) r = this->_GD0< 2 >( );
-  else if( dIt->second.second == "3" ) r = this->_GD0< 3 >( );
-  else if( dIt->second.second == "4" ) r = this->_GD0< 4 >( );
+  if     ( dim == 2 ) r = this->_GD0< 2 >( );
+  else if( dim == 3 ) r = this->_GD0< 3 >( );
+  else if( dim == 4 ) r = this->_GD0< 4 >( );
 
   return( r );
 }
@@ -62,61 +62,55 @@ template< unsigned int D >
 std::string cpPlugins::Plugins::ImageSeriesReader::
 _GD0( )
 {
-  TParameters::const_iterator tIt, cIt;
-
-  // Get image pixel type
-  tIt = this->m_Parameters.find( "PixelType" );
-  if( tIt == this->m_Parameters.end( ) )
-    tIt = this->m_DefaultParameters.find( "PixelType" );
-  cIt = this->m_Parameters.find( "IsColorImage" );
-  if( cIt == this->m_Parameters.end( ) )
-    cIt = this->m_DefaultParameters.find( "IsColorImage" );
+  using namespace cpPlugins::Interface;
+  Parameters::TString pt = this->m_Parameters.GetValueAsString( "PixelType" );
+  Parameters::TUint ci = this->m_Parameters.GetValueAsUint( "IsColorImage" );
 
   std::string r = "cpPlugins::Plugins::ImageSeriesReader: itk::Image pixel type not supported";
-  if( cIt->second.second == "0" )
+  if( ci == 0 )
   {
-    if( tIt->second.second == "char" )
+    if( pt == "char" )
       r = this->_GD1< char, D >( );
-    else if( tIt->second.second == "short" )
+    else if( pt == "short" )
       r = this->_GD1< short, D >( );
-    else if( tIt->second.second == "int" )
+    else if( pt == "int" )
       r = this->_GD1< int, D >( );
-    else if( tIt->second.second == "long" )
+    else if( pt == "long" )
       r = this->_GD1< long, D >( );
-    else if( tIt->second.second == "uchar" )
+    else if( pt == "uchar" )
       r = this->_GD1< unsigned char, D >( );
-    else if( tIt->second.second == "ushort" )
+    else if( pt == "ushort" )
       r = this->_GD1< unsigned short, D >( );
-    else if( tIt->second.second == "uint" )
+    else if( pt == "uint" )
       r = this->_GD1< unsigned int, D >( );
-    else if( tIt->second.second == "ulong" )
+    else if( pt == "ulong" )
       r = this->_GD1< unsigned long, D >( );
-    else if( tIt->second.second == "float" )
+    else if( pt == "float" )
       r = this->_GD1< float, D >( );
-    else if( tIt->second.second == "double" )
+    else if( pt == "double" )
       r = this->_GD1< double, D >( );
   }
-  else if( cIt->second.second == "1" )
+  else if( ci == 1 )
   {
-    if( tIt->second.second == "char" )
+    if( pt == "char" )
       r = this->_GD1< itk::RGBPixel< char >, D >( );
-    else if( tIt->second.second == "short" )
+    else if( pt == "short" )
       r = this->_GD1< itk::RGBPixel< short >, D >( );
-    else if( tIt->second.second == "int" )
+    else if( pt == "int" )
       r = this->_GD1< itk::RGBPixel< int >, D >( );
-    else if( tIt->second.second == "long" )
+    else if( pt == "long" )
       r = this->_GD1< itk::RGBPixel< long >, D >( );
-    else if( tIt->second.second == "uchar" )
+    else if( pt == "uchar" )
       r = this->_GD1< itk::RGBPixel< unsigned char >, D >( );
-    else if( tIt->second.second == "ushort" )
+    else if( pt == "ushort" )
       r = this->_GD1< itk::RGBPixel< unsigned short >, D >( );
-    else if( tIt->second.second == "uint" )
+    else if( pt == "uint" )
       r = this->_GD1< itk::RGBPixel< unsigned int >, D >( );
-    else if( tIt->second.second == "ulong" )
+    else if( pt == "ulong" )
       r = this->_GD1< itk::RGBPixel< unsigned long >, D >( );
-    else if( tIt->second.second == "float" )
+    else if( pt == "float" )
       r = this->_GD1< itk::RGBPixel< float >, D >( );
-    else if( tIt->second.second == "double" )
+    else if( pt == "double" )
       r = this->_GD1< itk::RGBPixel< double >, D >( );
   } // fi
   return( r );
@@ -127,17 +121,12 @@ template< class P, unsigned int D >
 std::string cpPlugins::Plugins::ImageSeriesReader::
 _GD1( )
 {
-  TParameters::const_iterator fIt;
-
-  // Get filenames
-  std::set< std::string > filenames;
-  fIt = this->m_Parameters.find( "FileNames" );
-  if( fIt == this->m_Parameters.end( ) )
-    fIt = this->m_DefaultParameters.find( "FileName" );
-  std::istringstream filenames_stream( fIt->second.second );
-  std::string filename;
-  while( std::getline( filenames_stream, filename, ';' ) )
-    filenames.insert( filename );
+  using namespace cpPlugins::Interface;
+  std::vector< Parameters::TString > unordered_names;
+  this->m_Parameters.GetValueAsStringList( unordered_names, "FileNames" );
+  std::set< std::string > ordered_names;
+  for( unsigned int i = 0; i < unordered_names.size( ); ++i )
+    ordered_names.insert( unordered_names[ i ] );
 
   // Reader
   typedef itk::Image< P, D > _TImage;
@@ -152,8 +141,8 @@ _GD1( )
       dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
 
   } // fi
-  std::set< std::string >::const_iterator fnIt = filenames.begin( );
-  for( ; fnIt != filenames.end( ); ++fnIt )
+  std::set< std::string >::const_iterator fnIt = ordered_names.begin( );
+  for( ; fnIt != ordered_names.end( ); ++fnIt )
     reader->AddFileName( *fnIt );
   try
   {