X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FAlgorithms%2FMultiScaleGaussianImageFilter.hxx;h=985cbec5a21efbd356b3d619bf17ae18abc7faaf;hb=8eaa2cf759c39233848cdd5b8346faccbea4c172;hp=c2e7cffa8cc4373acbe58b922851852365c0744b;hpb=2361f4f97631e09d88d8a5510a369817dcaa19db;p=cpPlugins.git

diff --git a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx
index c2e7cff..985cbec 100644
--- a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx
+++ b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
-#define __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
+#ifndef __cpExtensions__Algorithms__MultiScaleGaussianImageFilter__hxx__
+#define __cpExtensions__Algorithms__MultiScaleGaussianImageFilter__hxx__
 
 #include <vnl/vnl_vector.h>
 
@@ -14,9 +14,7 @@
 
 #include <itkBinaryFunctorImageFilter.h>
 #include <itkUnaryFunctorImageFilter.h>
-#include <itkGradientMagnitudeRecursiveGaussianImageFilter.h>
 #include <itkGradientRecursiveGaussianImageFilter.h>
-#include <itkHessianRecursiveGaussianImageFilter.h>
 
 // -------------------------------------------------------------------------
 template< class I, class O >
@@ -83,77 +81,6 @@ operator()( const _T& a, const _T& b ) const
   return( ( vb.magnitude( ) < va.magnitude( ) )? a: b );
 }
 
-// -------------------------------------------------------------------------
-template< class I, class O >
-void
-cpExtensions::Algorithms::
-MultiScaleGaussianImageFilter< I, O >::
-SetFilterToGradient( )
-{
-  if(
-    itk::NumericTraits< typename O::PixelType >::GetLength( ) ==
-    I::ImageDimension
-    )
-    this->m_FilterId = Self::Gradient;
-  else
-    this->m_FilterId = Self::None;
-  this->Modified( );
-}
-
-// -------------------------------------------------------------------------
-template< class I, class O >
-void
-cpExtensions::Algorithms::
-MultiScaleGaussianImageFilter< I, O >::
-SetFilterToGradientMagnitude( )
-{
-  if( itk::NumericTraits< typename O::PixelType >::GetLength( ) == 1 )
-    this->m_FilterId = Self::GradientMagnitude;
-  else
-    this->m_FilterId = Self::None;
-  this->Modified( );
-}
-
-// -------------------------------------------------------------------------
-template< class I, class O >
-void
-cpExtensions::Algorithms::
-MultiScaleGaussianImageFilter< I, O >::
-SetFilterToHessian( )
-{
-  itkExceptionMacro( << "Check for hessian definition." );
-}
-
-// -------------------------------------------------------------------------
-template< class I, class O >
-bool
-cpExtensions::Algorithms::
-MultiScaleGaussianImageFilter< I, O >::
-IsGradientFilter( ) const
-{
-  return( this->m_FilterId == Self::Gradient );
-}
-
-// -------------------------------------------------------------------------
-template< class I, class O >
-bool
-cpExtensions::Algorithms::
-MultiScaleGaussianImageFilter< I, O >::
-IsGradientMagnitudeFilter( ) const
-{
-  return( this->m_FilterId == Self::GradientMagnitude );
-}
-
-// -------------------------------------------------------------------------
-template< class I, class O >
-bool
-cpExtensions::Algorithms::
-MultiScaleGaussianImageFilter< I, O >::
-IsHessianFilter( ) const
-{
-  return( this->m_FilterId == Self::Hessian );
-}
-
 // -------------------------------------------------------------------------
 template< class I, class O >
 void
@@ -182,14 +109,6 @@ MultiScaleGaussianImageFilter< I, O >::
 MultiScaleGaussianImageFilter( )
   : Superclass( )
 {
-  this->SetFilterToGradientMagnitude( );
-  if( !this->IsGradientMagnitudeFilter( ) )
-  {
-    this->SetFilterToGradient( );
-    if( !this->IsGradientFilter( ) )
-      this->SetFilterToHessian( );
-
-  } // fi
 }
 
 // -------------------------------------------------------------------------
@@ -207,16 +126,8 @@ cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 GenerateData( )
 {
-  typedef itk::GradientRecursiveGaussianImageFilter< I, O >          _TGF;
-  typedef itk::GradientMagnitudeRecursiveGaussianImageFilter< I, O > _TGMF;
-  typedef itk::HessianRecursiveGaussianImageFilter< I, O >           _THF;
-
-  if( this->IsGradientFilter( ) )
-    this->_GenerateData< _TGF >( );
-  else if( this->IsGradientMagnitudeFilter( ) )
-    this->_GenerateData< _TGMF >( );
-  else if( this->IsHessianFilter( ) )
-    this->_GenerateData< _THF >( );
+  typedef itk::GradientRecursiveGaussianImageFilter< I, O > _TGF;
+  this->_GenerateData< _TGF >( );
 }
 
 // -------------------------------------------------------------------------
@@ -310,6 +221,6 @@ _GenerateData( )
   } // rof
 }
 
-#endif // __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
+#endif // __cpExtensions__Algorithms__MultiScaleGaussianImageFilter__hxx__
 
 // eof - $RCSfile$