X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkAffineRegistrationGenericFilter.h;h=22b9f522585c241f99ee48e3a3376e6a861d4a56;hb=e751b47051ae80ecd388418ae39b388f15e627eb;hp=2cb5a8ce6cfe87d25ed2b9d8ae8d8908deaf8bfa;hpb=20002bb35aa557d2d8c7db9ea96915f6953ade9c;p=clitk.git

diff --git a/registration/clitkAffineRegistrationGenericFilter.h b/registration/clitkAffineRegistrationGenericFilter.h
index 2cb5a8c..22b9f52 100644
--- a/registration/clitkAffineRegistrationGenericFilter.h
+++ b/registration/clitkAffineRegistrationGenericFilter.h
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 #ifndef CLITKAFFINEREGISTRATIONGENERICFILTER_H
 #define CLITKAFFINEREGISTRATIONGENERICFILTER_H
@@ -22,7 +22,9 @@
 // clitk include
 #include "clitkIO.h"
 #include "clitkCommon.h"
+#include "clitkImageCommon.h"
 #include "clitkAffineRegistration_ggo.h"
+#include "clitkImageArithm_ggo.h"
 #include "clitkCorrelationRatioImageToImageMetric.h"
 #include "clitkTransformUtilities.h"
 #include "clitkGenericMetric.h"
@@ -60,9 +62,8 @@ namespace clitk
 {
 
 //====================================================================
-template<class args_info_clitkAffineRegistration>
 class ITK_EXPORT AffineRegistrationGenericFilter:
-    public ImageToImageGenericFilter<AffineRegistrationGenericFilter<args_info_clitkAffineRegistration> >
+    public ImageToImageGenericFilter<AffineRegistrationGenericFilter>
 {
 public:
 
@@ -70,27 +71,19 @@ public:
 
   //================================================
   typedef AffineRegistrationGenericFilter        Self;
+  
   typedef itk::SmartPointer<Self>        Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
-
+  typedef ImageToImageGenericFilterBase   Superclass;
   //================================================
   itkNewMacro(Self);
-  itkTypeMacro(AffineRegistrationGenericFilter, LightObject);
+  //itkTypeMacro(AffineRegistrationGenericFilter, LightObject);
 
 
   //====================================================================
   // Set methods
-  void SetArgsInfo(const args_info_clitkAffineRegistration args_info) {
-    m_ArgsInfo=args_info;
-    m_Verbose=m_ArgsInfo.verbose_flag;
-    if (m_ArgsInfo.reference_given) {
-      SetInputFilename(m_ArgsInfo.reference_arg);
-    }
-    if (m_ArgsInfo.target_given) {
-      SetOutputFilename(m_ArgsInfo.target_arg);
-    }
-
-  }
+       void SetArgsInfo(const args_info_clitkAffineRegistration & a);
+
   //====================================================================
   template<unsigned int Dim>
   void InitializeImageType();
@@ -103,9 +96,4 @@ public:
 };
 }
 
-#ifndef ITK_MANUAL_INSTANTIATION
-#include "clitkAffineRegistrationGenericFilter.txx"
-#endif
-
-
 #endif //#define CLITKAFFINEREGISTRATIONGENERICFILTER__H