X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FAlgorithms%2FMultiScaleGaussianImageFilter.h;h=63fb8a8771dd37e9f5ecf0f71b23fce62d891b95;hb=9af34b55ea1d60eef3608aede00f9ef5a16dccdf;hp=5dba45bfb2e710a1a1da8055b941e182d7fd19b5;hpb=1b0022070ff3b5f80f6f8c8b87f73032f5685eaf;p=cpPlugins.git

diff --git a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
index 5dba45b..63fb8a8 100644
--- a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
+++ b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
@@ -2,9 +2,10 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
-#define __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
+#ifndef __cpExtensions__Algorithms__MultiScaleGaussianImageFilter__h__
+#define __cpExtensions__Algorithms__MultiScaleGaussianImageFilter__h__
 
+#include <cpExtensions/Config.h>
 #include <set>
 #include <itkImageToImageFilter.h>
 
@@ -29,14 +30,6 @@ namespace cpExtensions
 
       typedef std::set< double > TScalesContainer;
 
-      enum FilterId
-      {
-        Gradient = 0,
-        GradientMagnitude,
-        Hessian,
-        None
-      };
-
     protected:
       /**
        */
@@ -59,14 +52,6 @@ namespace cpExtensions
       itkTypeMacro( MultiScaleGaussianImageFilter, itkImageToImageFilter );
 
     public:
-      void SetFilterToGradient( );
-      void SetFilterToGradientMagnitude( );
-      void SetFilterToHessian( );
-
-      bool IsGradientFilter( ) const;
-      bool IsGradientMagnitudeFilter( ) const;
-      bool IsHessianFilter( ) const;
-
       void AddScale( const double& s );
       unsigned long GetNumberOfScales( ) const;
 
@@ -74,7 +59,7 @@ namespace cpExtensions
       MultiScaleGaussianImageFilter( );
       virtual ~MultiScaleGaussianImageFilter( );
 
-      virtual void GenerateData( );
+      virtual void GenerateData( ) cpExtensions_OVERRIDE;
 
       template< class F >
       void _GenerateData( );
@@ -86,7 +71,6 @@ namespace cpExtensions
 
     protected:
       TScalesContainer m_Scales;
-      FilterId m_FilterId;
     };
 
   } // ecapseman
@@ -94,9 +78,9 @@ namespace cpExtensions
 } // ecapseman
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
+#  include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
 #endif // ITK_MANUAL_INSTANTIATION
 
-#endif // __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
+#endif // __cpExtensions__Algorithms__MultiScaleGaussianImageFilter__h__
 
 // eof - $RCSfile$