X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FImageReader.cxx;h=0aa4bfc233f7ae56f0f57c259ec86ed8cd9cd711;hb=cb833d2fface96e020fe91584d2206860a8174ee;hp=2d25301b04ba35fcbba36d0dc1b32b04ef706e1f;hpb=1adce86c283e253ec41f762652bc477d56d617a5;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/ImageReader.cxx b/lib/cpPlugins/Plugins/ImageReader.cxx
index 2d25301..0aa4bfc 100644
--- a/lib/cpPlugins/Plugins/ImageReader.cxx
+++ b/lib/cpPlugins/Plugins/ImageReader.cxx
@@ -7,6 +7,13 @@
 #include <itkImage.h>
 #include <itkRGBPixel.h>
 
+// -------------------------------------------------------------------------
+std::string cpPlugins::Plugins::ImageReader::
+GetClassName( ) const
+{
+  return( "cpPlugins::Plugins::ImageReader" );
+}
+
 // -------------------------------------------------------------------------
 cpPlugins::Plugins::ImageReader::
 ImageReader( )
@@ -28,13 +35,6 @@ cpPlugins::Plugins::ImageReader::
 {
 }
 
-// -------------------------------------------------------------------------
-std::string cpPlugins::Plugins::ImageReader::
-GetClassName( ) const
-{
-  return( "cpPlugins::Plugins::ImageReader" );
-}
-
 // -------------------------------------------------------------------------
 std::string cpPlugins::Plugins::ImageReader::
 _GenerateData( )
@@ -46,23 +46,23 @@ _GenerateData( )
   if( dIt == this->m_Parameters.end( ) )
     dIt = this->m_DefaultParameters.find( "ImageDimension" );
 
-  std::string ret = "itk::Image dimension not supported.";
-  if     ( dIt->second.second == "1" ) ret = this->_GenerateData0< 1 >( );
-  else if( dIt->second.second == "2" ) ret = this->_GenerateData0< 2 >( );
-  else if( dIt->second.second == "3" ) ret = this->_GenerateData0< 3 >( );
-  else if( dIt->second.second == "4" ) ret = this->_GenerateData0< 4 >( );
+  std::string r = "cpPlugins::Plugins::ImageReader: itk::Image dimension not supported.";
+  if     ( dIt->second.second == "1" ) r = this->_GD0< 1 >( );
+  else 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 >( );
 
-  return( ret );
+  return( r );
 }
 
 // -------------------------------------------------------------------------
 template< unsigned int D >
 std::string cpPlugins::Plugins::ImageReader::
-_GenerateData0( )
+_GD0( )
 {
   TParameters::const_iterator tIt, cIt;
 
-  // Get image pixelType
+  // Get image pixel type
   tIt = this->m_Parameters.find( "PixelType" );
   if( tIt == this->m_Parameters.end( ) )
     tIt = this->m_DefaultParameters.find( "PixelType" );
@@ -70,77 +70,78 @@ _GenerateData0( )
   if( cIt == this->m_Parameters.end( ) )
     cIt = this->m_DefaultParameters.find( "IsColorImage" );
 
-  std::string ret = "itk::Image pixel type not supported";
+  std::string r = "cpPlugins::Plugins::ImageReader: itk::Image pixel type not supported";
   if( cIt->second.second == "0" )
   {
     if( tIt->second.second == "char" )
-      ret = this->_GenerateData1< char, D >( );
+      r = this->_GD1< char, D >( );
     else if( tIt->second.second == "short" )
-      ret = this->_GenerateData1< short, D >( );
+      r = this->_GD1< short, D >( );
     else if( tIt->second.second == "int" )
-      ret = this->_GenerateData1< int, D >( );
+      r = this->_GD1< int, D >( );
     else if( tIt->second.second == "long" )
-      ret = this->_GenerateData1< long, D >( );
+      r = this->_GD1< long, D >( );
     else if( tIt->second.second == "uchar" )
-      ret = this->_GenerateData1< unsigned char, D >( );
+      r = this->_GD1< unsigned char, D >( );
     else if( tIt->second.second == "ushort" )
-      ret = this->_GenerateData1< unsigned short, D >( );
+      r = this->_GD1< unsigned short, D >( );
     else if( tIt->second.second == "uint" )
-      ret = this->_GenerateData1< unsigned int, D >( );
+      r = this->_GD1< unsigned int, D >( );
     else if( tIt->second.second == "ulong" )
-      ret = this->_GenerateData1< unsigned long, D >( );
+      r = this->_GD1< unsigned long, D >( );
     else if( tIt->second.second == "float" )
-      ret = this->_GenerateData1< float, D >( );
+      r = this->_GD1< float, D >( );
     else if( tIt->second.second == "double" )
-      ret = this->_GenerateData1< double, D >( );
+      r = this->_GD1< double, D >( );
   }
   else if( cIt->second.second == "1" )
   {
     if( tIt->second.second == "char" )
-      ret = this->_GenerateData1< itk::RGBPixel< char >, D >( );
+      r = this->_GD1< itk::RGBPixel< char >, D >( );
     else if( tIt->second.second == "short" )
-      ret = this->_GenerateData1< itk::RGBPixel< short >, D >( );
+      r = this->_GD1< itk::RGBPixel< short >, D >( );
     else if( tIt->second.second == "int" )
-      ret = this->_GenerateData1< itk::RGBPixel< int >, D >( );
+      r = this->_GD1< itk::RGBPixel< int >, D >( );
     else if( tIt->second.second == "long" )
-      ret = this->_GenerateData1< itk::RGBPixel< long >, D >( );
+      r = this->_GD1< itk::RGBPixel< long >, D >( );
     else if( tIt->second.second == "uchar" )
-      ret = this->_GenerateData1< itk::RGBPixel< unsigned char >, D >( );
+      r = this->_GD1< itk::RGBPixel< unsigned char >, D >( );
     else if( tIt->second.second == "ushort" )
-      ret = this->_GenerateData1< itk::RGBPixel< unsigned short >, D >( );
+      r = this->_GD1< itk::RGBPixel< unsigned short >, D >( );
     else if( tIt->second.second == "uint" )
-      ret = this->_GenerateData1< itk::RGBPixel< unsigned int >, D >( );
+      r = this->_GD1< itk::RGBPixel< unsigned int >, D >( );
     else if( tIt->second.second == "ulong" )
-      ret = this->_GenerateData1< itk::RGBPixel< unsigned long >, D >( );
+      r = this->_GD1< itk::RGBPixel< unsigned long >, D >( );
     else if( tIt->second.second == "float" )
-      ret = this->_GenerateData1< itk::RGBPixel< float >, D >( );
+      r = this->_GD1< itk::RGBPixel< float >, D >( );
     else if( tIt->second.second == "double" )
-      ret = this->_GenerateData1< itk::RGBPixel< double >, D >( );
+      r = this->_GD1< itk::RGBPixel< double >, D >( );
   } // fi
-  return( ret );
+  return( r );
 }
 
 // -------------------------------------------------------------------------
 template< class P, unsigned int D >
 std::string cpPlugins::Plugins::ImageReader::
-_GenerateData1( )
+_GD1( )
 {
   TParameters::const_iterator fIt;
 
-  // Get image pixelType
+  // Get filename
   fIt = this->m_Parameters.find( "FileName" );
   if( fIt == this->m_Parameters.end( ) )
     fIt = this->m_DefaultParameters.find( "FileName" );
 
   typedef itk::Image< P, D > _TImage;
-  typedef itk::ImageFileReader< _TImage > _TImageReader;
+  typedef itk::ImageFileReader< _TImage > _TReader;
 
-  _TImageReader* reader =
-    dynamic_cast< _TImageReader* >( this->m_Reader.GetPointer( ) );
+  _TReader* reader =
+    dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
   if( reader == NULL )
   {
-    this->m_Reader = _TImageReader::New( );
-    reader = dynamic_cast< _TImageReader* >( this->m_Reader.GetPointer( ) );
+    this->m_RealProcessObject = _TReader::New( );
+    reader =
+      dynamic_cast< _TReader* >( this->m_RealProcessObject.GetPointer( ) );
 
   } // fi
   reader->SetFileName( fIt->second.second );