X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkAffineRegistrationGenericFilter.h;h=2cb5a8ce6cfe87d25ed2b9d8ae8d8908deaf8bfa;hb=2368cbc03789119dd0b3ed2ab17e56e464ee0100;hp=830046f637394a4153a39430d8bc57738a933fdc;hpb=c18059db4f507fd31b5898667f57eced7d48c5f7;p=clitk.git

diff --git a/registration/clitkAffineRegistrationGenericFilter.h b/registration/clitkAffineRegistrationGenericFilter.h
index 830046f..2cb5a8c 100644
--- a/registration/clitkAffineRegistrationGenericFilter.h
+++ b/registration/clitkAffineRegistrationGenericFilter.h
@@ -29,6 +29,8 @@
 #include "clitkGenericOptimizer.h"
 #include "clitkGenericInterpolator.h"
 #include "clitkGenericAffineTransform.h"
+#include "clitkImageToImageGenericFilter.h"
+
 
 //itk include
 #include <itkMultiResolutionImageRegistrationMethod.h>
@@ -58,52 +60,46 @@ namespace clitk
 {
 
 //====================================================================
-class AffineRegistrationGenericFilter: public itk::LightObject
+template<class args_info_clitkAffineRegistration>
+class ITK_EXPORT AffineRegistrationGenericFilter:
+    public ImageToImageGenericFilter<AffineRegistrationGenericFilter<args_info_clitkAffineRegistration> >
 {
 public:
 
+  AffineRegistrationGenericFilter();
+
   //================================================
   typedef AffineRegistrationGenericFilter        Self;
-  typedef itk::LightObject  Superclass;
   typedef itk::SmartPointer<Self>        Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
 
   //================================================
   itkNewMacro(Self);
+  itkTypeMacro(AffineRegistrationGenericFilter, LightObject);
+
 
   //====================================================================
   // Set methods
   void SetArgsInfo(const args_info_clitkAffineRegistration args_info) {
     m_ArgsInfo=args_info;
     m_Verbose=m_ArgsInfo.verbose_flag;
-  }
-
-  //====================================================================
-  // Update
-  void Update();
+    if (m_ArgsInfo.reference_given) {
+      SetInputFilename(m_ArgsInfo.reference_arg);
+    }
+    if (m_ArgsInfo.target_given) {
+      SetOutputFilename(m_ArgsInfo.target_arg);
+    }
 
-protected:
-  const char * GetNameOfClass() const {
-    return "AffineRegistrationGenericFilter";
   }
-
   //====================================================================
-  // Constructor & Destructor
-  AffineRegistrationGenericFilter();
-  ~AffineRegistrationGenericFilter() {
-    ;
-  }
-
-  //====================================================================
-  //Templated member functions
-  template <unsigned int Dimension> void UpdateWithDim(std::string PixelType);
-  template <unsigned int Dimension, class PixelType> void UpdateWithDimAndPixelType();
+  template<unsigned int Dim>
+  void InitializeImageType();
 
-  //====================================================================
-  //Member Data
-public:
   bool m_Verbose;
   args_info_clitkAffineRegistration m_ArgsInfo;
+
+  template<class InputImageType>
+  void UpdateWithInputImageType();
 };
 }