...

[cpPlugins.git] / plugins / cpPluginsImageFilters / MultiScaleGaussianImageFilter.cxx

diff --git a/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx b/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
index 224aa877e7377973e2ff78e50ef0cf27ecf184fb..f528e8eea64f4ffd4f95936dd9609801bfda7a46 100644 (file)
--- a/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
@@ -2,30 +2,6 @@
 #include <cpPlugins/Image.h>
 #include <cpPlugins_Instances/GaussianImageFilters.h>
 
-/*
-  #include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h>
-  #include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
-  #include <itkGradientRecursiveGaussianImageFilter.hxx>
-  #include <itkImageAdaptor.hxx>
-  #include <itkImageToImageFilter.hxx>
-  #include <itkInPlaceImageFilter.hxx>
-  #include <itkUnaryFunctorImageFilter.hxx>
-  #include <itkRecursiveGaussianImageFilter.hxx>
-  #include <itkImageConstIteratorWithIndex.hxx>
-  #include <itkRecursiveSeparableImageFilter.hxx>
-  #include <itkBinaryFunctorImageFilter.hxx>
-  #include <itkImageRegionConstIterator.hxx>
-  #include <itkImageScanlineIterator.hxx>
-  #include <itkImageSource.hxx>
-  #include <itkImageRegionIteratorWithIndex.hxx>
-  #include <itkImageScanlineConstIterator.hxx>
-  #include <itkImageRegionIterator.hxx>
-  #include <itkSimpleDataObjectDecorator.hxx>
-  #include <itkImageRegionConstIteratorWithIndex.hxx>
-  #include <itkNthElementPixelAccessor.h>
-  #include <itkImageBase.hxx>
-*/
-
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::MultiScaleGaussianImageFilter::
 MultiScaleGaussianImageFilter( )
@@ -50,38 +26,34 @@ cpPluginsImageFilters::MultiScaleGaussianImageFilter::
 }
 
 // -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::MultiScaleGaussianImageFilter::
+void cpPluginsImageFilters::MultiScaleGaussianImageFilter::
 _GenerateData( )
 {
   auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  return( r );
+  cpPlugins_Image_Demangle_Pixel_AllScalars     ( _GD0, image, 2 );
+  else cpPlugins_Image_Demangle_Pixel_AllScalars( _GD0, image, 3 );
+  else this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage >
-std::string cpPluginsImageFilters::MultiScaleGaussianImageFilter::
+void cpPluginsImageFilters::MultiScaleGaussianImageFilter::
 _GD0( _TImage* image )
 {
   if( image != NULL )
   {
     auto choice = this->m_Parameters.GetSelectedChoice( "ScalarType" );
-    if( choice == "float" )
-      return( this->_GD1< _TImage, float >( image ) );
-    else if( choice == "double" )
-      return( this->_GD1< _TImage, double >( image ) );
-    else return( "MultiScaleGaussianImageFilter: no valid scalar type." );
+    if     ( choice == "float" )  this->_GD1< _TImage, float >( image );
+    else if( choice == "double" ) this->_GD1< _TImage, double >( image );
+    else                          this->_Error( "No valid scalar type." );
   }
   else
-    return(
-      "MultiScaleGaussianImageFilter: No valid input image."
-      );
+    this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage, class _TScalar >
-std::string cpPluginsImageFilters::MultiScaleGaussianImageFilter::
+void cpPluginsImageFilters::MultiScaleGaussianImageFilter::
 _GD1( _TImage* image )
 {
   typedef itk::CovariantVector< _TScalar, _TImage::ImageDimension > _TVector;
@@ -92,9 +64,7 @@ _GD1( _TImage* image )
 
   auto sigmas = this->m_Parameters.GetRealList( "Sigmas" );
   if( sigmas.size( ) == 0 )
-    return(
-      "MultiScaleGaussianImageFilter: No given sigmas."
-      );
+    this->_Error( "No given sigmas." );
 
   // Configure filter
   _TFilter* filter = this->_CreateITK< _TFilter >( );
@@ -105,7 +75,6 @@ _GD1( _TImage* image )
 
   // Connect output
   this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
 }
 
 // eof - $RCSfile$