- new GF system

[clitk.git] / filters / clitkImageArithmGenericFilter.h

diff --git a/filters/clitkImageArithmGenericFilter.h b/filters/clitkImageArithmGenericFilter.h
index 88449119e7639c079d279e172bdadcd1f48ebfcd..afc6134eba3365f14c9f72cd2b17175209bc4dc8 100644 (file)
--- a/filters/clitkImageArithmGenericFilter.h
+++ b/filters/clitkImageArithmGenericFilter.h
@@ -38,7 +38,8 @@ namespace clitk {
   //--------------------------------------------------------------------
   // Main class for an Image Resample Generic Filter 
   // (multiple dimensions, multiple pixel types)
-  class ImageArithmGenericFilter : public clitk::ImageToImageGenericFilter {
+  class ImageArithmGenericFilter:
+  public clitk::ImageToImageGenericFilter<ImageArithmGenericFilter> {
   
   public:
        
@@ -47,7 +48,7 @@ namespace clitk {
 
     // Types
     typedef ImageArithmGenericFilter      Self;
-    typedef ImageToImageGenericFilter     Superclass;
+    typedef ImageToImageGenericFilterBase     Superclass;
     typedef itk::SmartPointer<Self>       Pointer;
     typedef itk::SmartPointer<const Self> ConstPointer;
 
@@ -64,19 +65,18 @@ namespace clitk {
     int GetTypeOfOperation () { return  mTypeOfOperation ;} 
     double GetScalar () { return  mScalar ;} 
 
-    // Update
-    void Update ();
+    //--------------------------------------------------------------------
+    // Main function called each time the filter is updated
+    template<class InputImageType>  
+    void UpdateWithInputImageType();
 
   protected:  
+    template<unsigned int Dim> void InitializeImageType();
     bool mIsOperationUseASecondImage;
     double mScalar;
     double mDefaultPixelValue;
     int mTypeOfOperation;  
 
-    //--------------------------------------------------------------------
-    template<unsigned int Dim> void Update_WithDim();
-    template<unsigned int Dim, class PixelType> void Update_WithDimAndPixelType();
-
     template<class ImageType>
     typename ImageType::Pointer ComputeImage(typename ImageType::Pointer inputImage);
 
@@ -89,7 +89,7 @@ namespace clitk {
   }; // end class ImageArithmGenericFilter
 //--------------------------------------------------------------------
 
-#include "clitkImageArithmGenericFilter.txx"
+//#include "clitkImageArithmGenericFilter.txx"
 
 } // end namespace
 //--------------------------------------------------------------------