X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkBLUTDIRGenericFilter.h;h=eda242f5b4d7d843a91cb2809dbbe319536d06db;hb=5a7da4aedae5c204bc55c187717193e5950f9a44;hp=af0efe8f3925fdb6891cf951dd3a025872f45535;hpb=657652a78c2e2717a6f77e027049173442ca29f0;p=clitk.git

diff --git a/registration/clitkBLUTDIRGenericFilter.h b/registration/clitkBLUTDIRGenericFilter.h
old mode 100755
new mode 100644
index af0efe8..eda242f
--- a/registration/clitkBLUTDIRGenericFilter.h
+++ b/registration/clitkBLUTDIRGenericFilter.h
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  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,17 +14,17 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef clitkBLUTDIRGenericFilter_h
 #define clitkBLUTDIRGenericFilter_h
 
 /* =================================================
  * @file   clitkBLUTDIRGenericFilter.h
- * @author 
- * @date   
- * 
- * @brief 
- * 
+ * @author
+ * @date
+ *
+ * @brief
+ *
  ===================================================*/
 
 
@@ -35,12 +35,13 @@
 #include "clitkDifferenceImageFilter.h"
 #include "clitkTransformUtilities.h"
 #include "clitkLBFGSBOptimizer.h"
-#include "clitkBSplineDeformableTransform.h"
+#include "clitkMultipleBSplineDeformableTransform.h"
 #include "clitkGenericOptimizer.h"
 #include "clitkGenericInterpolator.h"
 #include "clitkGenericMetric.h"
-#include "clitkBSplineDeformableTransformInitializer.h"
+#include "clitkMultipleBSplineDeformableTransformInitializer.h"
 #include "clitkMultiResolutionPyramidRegionFilter.h"
+#include "clitkImageToImageGenericFilter.h"
 
 // itk include
 #include "itkMultiResolutionImageRegistrationMethod.h"
@@ -56,84 +57,50 @@
 #include "itkLightObject.h"
 #include "itkImageToImageMetric.h"
 #include "itkInterpolateImageFunction.h"
-#include "itkLabelStatisticsImageFilter.h"
+#include "itkLabelGeometryImageFilter.h"
 #include "itkImageDuplicator.h"
 #include "itkExtractImageFilter.h"
-#include "itkTransformToDeformationFieldSource.h"
+#if ITK_VERSION_MAJOR >= 4
+  #include "itkTransformToDisplacementFieldSource.h"
+#else
+  #include "itkTransformToDeformationFieldSource.h"
+#endif
 
-namespace clitk 
+namespace clitk
 {
 
-
-  class ITK_EXPORT BLUTDIRGenericFilter : public itk::LightObject
+  class ITK_EXPORT BLUTDIRGenericFilter :public ImageToImageGenericFilter<BLUTDIRGenericFilter>
   {
   public:
     //----------------------------------------
-    // ITK
+    BLUTDIRGenericFilter();
     //----------------------------------------
     typedef BLUTDIRGenericFilter                   Self;
-    typedef itk::LightObject                   Superclass;
     typedef itk::SmartPointer<Self>            Pointer;
     typedef itk::SmartPointer<const Self>      ConstPointer;
-   
-    // Method for creation through the object factory
-    itkNewMacro(Self);  
+    typedef ImageToImageGenericFilterBase   Superclass;
 
-    // Run-time type information (and related methods)
-    itkTypeMacro( BLUTDIRGenericFilter, LightObject );
+    // Method for creation through the object factory
+    itkNewMacro(Self);
 
+    void SetArgsInfo(const args_info_clitkBLUTDIR & a);
 
-    //----------------------------------------
-    // Typedefs
-    //----------------------------------------
-
+    // Run-time type information (and related methods)
 
-    //----------------------------------------
-    // Set & Get
-    //----------------------------------------    
-    void SetArgsInfo(const args_info_clitkBLUTDIR & a)
-    {
-      m_ArgsInfo=a;
-      m_ReferenceFileName=m_ArgsInfo.reference_arg;
-      m_Verbose=m_ArgsInfo.verbose_flag;
-    }
-    
-    
-    //----------------------------------------  
-    // Update
-    //----------------------------------------  
-    void Update();
-
-  protected:
-
-    //----------------------------------------  
-    // Constructor & Destructor
-    //----------------------------------------  
-    BLUTDIRGenericFilter();
-    ~BLUTDIRGenericFilter() {};
+    template<unsigned int Dim>
+    void InitializeImageType();
 
-    
-    //----------------------------------------  
-    // Templated members
-    //----------------------------------------  
-    template <unsigned int Dimension>  void UpdateWithDim(std::string PixelType);
-    template <unsigned int Dimension, class PixelType>  void UpdateWithDimAndPixelType();
 
+    template<class InputImageType>
+    void UpdateWithInputImageType();
 
-    //----------------------------------------  
-    // Data members
-    //----------------------------------------
     args_info_clitkBLUTDIR m_ArgsInfo;
     bool m_Verbose;
     std::string m_ReferenceFileName;
 
   };
 
-
 } // end namespace clitk
 
-#ifndef ITK_MANUAL_INSTANTIATION
-#include "clitkBLUTDIRGenericFilter.txx"
-#endif
 
 #endif // #define clitkBLUTDIRGenericFilter_h