Filters improved

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

diff --git a/lib/cpPlugins/Plugins/ImageWriter.cxx b/lib/cpPlugins/Plugins/ImageWriter.cxx
index afd5b30858b5b9b72b4f8f1c3af2bf8d1e0d0d86..de74e90d019c5884c8ea32aa9903b5a1e0c344c2 100644 (file)
--- a/lib/cpPlugins/Plugins/ImageWriter.cxx
+++ b/lib/cpPlugins/Plugins/ImageWriter.cxx
@@ -23,6 +23,13 @@
     )                                                                   \
     r = this->f< itk::RGBPixel< p >, d >( )
 
+// -------------------------------------------------------------------------
+std::string cpPlugins::Plugins::ImageWriter::
+GetClassName( ) const
+{
+  return( "cpPlugins::Plugins::ImageWriter" );
+}
+
 // -------------------------------------------------------------------------
 cpPlugins::Plugins::ImageWriter::
 ImageWriter( )
@@ -30,8 +37,9 @@ ImageWriter( )
 {
   this->SetNumberOfInputs( 1 );
 
-  this->m_DefaultParameters[ "FileName" ] =
-    TParameter( "string", "no_file_name" );
+  using namespace cpPlugins::Interface;
+  this->m_DefaultParameters.Configure( Parameters::String, "FileName" );
+  this->m_Parameters = this->m_DefaultParameters;
 }
 
 // -------------------------------------------------------------------------
@@ -40,20 +48,13 @@ cpPlugins::Plugins::ImageWriter::
 {
 }
 
-// -------------------------------------------------------------------------
-std::string cpPlugins::Plugins::ImageWriter::
-GetClassName( ) const
-{
-  return( "cpPlugins::Plugins::ImageWriter" );
-}
-
 // -------------------------------------------------------------------------
 std::string cpPlugins::Plugins::ImageWriter::
 _GenerateData( )
 {
   itk::DataObject* o = this->_GetInput( 0 );
 
-  std::string r = "itk::Image dimension not supported.";
+  std::string r = "cpPlugins::Plugins::ImageWriter: itk::Image dimension not supported.";
   cpPlugins_ImageWriter_Dimension( r, 1, o, _GD0 );
   else cpPlugins_ImageWriter_Dimension( r, 2, o, _GD0 );
   else cpPlugins_ImageWriter_Dimension( r, 3, o, _GD0 );
@@ -69,7 +70,7 @@ _GD0( )
   itk::ImageBase< D >* i =
     dynamic_cast< itk::ImageBase< D >* >( this->_GetInput( 0 ) );
 
-  std::string r = "itk::Image pixel type not supported";
+  std::string r = "cpPlugins::Plugins::ImageWriter: itk::Image pixel type not supported";
   cpPlugins_ImageWriter_Pixel( r, char, D, i, _GD1 );
   else cpPlugins_ImageWriter_Pixel( r, short, D, i, _GD1 );
   else cpPlugins_ImageWriter_Pixel( r, int, D, i, _GD1 );
@@ -99,24 +100,23 @@ std::string cpPlugins::Plugins::ImageWriter::
 _GD1( )
 {
   typedef itk::Image< P, D > _TImage;
-  typedef itk::ImageFileWriter< _TImage > _TImageWriter;
-
-  TParameters::const_iterator fIt;
+  typedef itk::ImageFileWriter< _TImage > _TWriter;
 
-  // Get image pixelType
-  fIt = this->m_Parameters.find( "FileName" );
-  if( fIt == this->m_Parameters.end( ) )
-    fIt = this->m_DefaultParameters.find( "FileName" );
+  // Get filename
+  using namespace cpPlugins::Interface;
+  Parameters::TString fname =
+    this->m_Parameters.GetValueAsString( "FileName" );
 
-  _TImageWriter* writer =
-    dynamic_cast< _TImageWriter* >( this->m_Writer.GetPointer( ) );
+  _TWriter* writer =
+    dynamic_cast< _TWriter* >( this->m_RealProcessObject.GetPointer( ) );
   if( writer == NULL )
   {
-    this->m_Writer = _TImageWriter::New( );
-    writer = dynamic_cast< _TImageWriter* >( this->m_Writer.GetPointer( ) );
+    this->m_RealProcessObject = _TWriter::New( );
+    writer =
+      dynamic_cast< _TWriter* >( this->m_RealProcessObject.GetPointer( ) );
 
   } // fi
-  writer->SetFileName( fIt->second.second );
+  writer->SetFileName( fname );
   writer->SetInput( dynamic_cast< _TImage* >( this->_GetInput( 0 ) ) );
   try
   {