MPR objects updated

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

diff --git a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
index 6e3ca3443d6d5f1be9ac036c377bd726dbcb2a11..05b9620d19591d6bcc7ba9bfa0ffcf23799bd6b8 100644 (file)
--- a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
@@ -1,16 +1,6 @@
 #include <cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.h>
 #include <cpPlugins/Image.h>
-#include <cpPlugins_ITKInstances/ImageFilters.h>
-
-#include <itkSignedMaurerDistanceMapImageFilter.h>
-#include <itkSignedMaurerDistanceMapImageFilter.hxx>
-
-#include <itkBinaryThresholdImageFilter.hxx>
-#include <itkImageToImageFilter.hxx>
-#include <itkInPlaceImageFilter.hxx>
-#include <itkUnaryFunctorImageFilter.hxx>
-#include <itkBinaryContourImageFilter.hxx>
-
+#include <cpPlugins_Instances/DistanceMapFilters.h>
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
@@ -44,44 +34,39 @@ cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
 }
 
 // -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
+void cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
 _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::SignedMaurerDistanceMapImageFilter::
+void cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
 _GD0( _TImage* image )
 {
+  static const unsigned int D = _TImage::ImageDimension;
   if( image != NULL )
   {
     std::string out_res =
       this->m_Parameters.GetSelectedChoice( "OutputResolution" );
     if( out_res == "float" )
-      return(
-        this->_GD1< _TImage, itk::Image< float, _TImage::ImageDimension > >( image )
-        );
-  else if( out_res == "double" )
-    return(
-      this->_GD1< _TImage, itk::Image< double, _TImage::ImageDimension > >( image )
-      );
-  else
-    return( "ImageFilters::SignedMaurerDistanceMapImageFilter: Output resolution not supported." );
+      this->_GD1< _TImage, itk::Image< float, D > >( image );
+    else if( out_res == "double" )
+      this->_GD1< _TImage, itk::Image< double, D > >( image );
+    else
+      this->_Error( "Output resolution not supported." );
   }
   else
-    return(
-      "ImageFilters::SignedMaurerDistanceMapImageFilter: No valid input image."
-      );
+    this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage, class _TDMap >
-std::string cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
+void cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
 _GD1( _TImage* image )
 {
   typedef itk::SignedMaurerDistanceMapImageFilter< _TImage, _TDMap > _F;
@@ -103,7 +88,6 @@ _GD1( _TImage* image )
 
   // Connect output
   this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
 }
 
 // eof - $RCSfile$