X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkCalculateTREGenericFilter.h;h=2f889f0aa7c09aa405457956ea842a32fda37765;hb=afd2671211668e6106886aa59c7bb13a82c48a94;hp=d9caea1890917ecca206c91d78637bbc35cfe2a2;hpb=657652a78c2e2717a6f77e027049173442ca29f0;p=clitk.git

diff --git a/registration/clitkCalculateTREGenericFilter.h b/registration/clitkCalculateTREGenericFilter.h
old mode 100755
new mode 100644
index d9caea1..2f889f0
--- a/registration/clitkCalculateTREGenericFilter.h
+++ b/registration/clitkCalculateTREGenericFilter.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 clitkCalculateTREGenericFilter_h
 #define clitkCalculateTREGenericFilter_h
 
@@ -67,9 +67,11 @@ namespace clitk
     itkTypeMacro( CalculateTREGenericFilter, LightObject );
 
 
-    //----------------------------------------
+    //-----------------------------
     // Typedefs
-    //----------------------------------------
+    //-----------------------------
+    typedef double ValueType;
+    typedef std::vector<ValueType> MeasureListType;
 
 
     //----------------------------------------
@@ -79,7 +81,6 @@ namespace clitk
     {
       m_ArgsInfo=a;
       m_Verbose=m_ArgsInfo.verbose_flag;
-      m_InputFileName=m_ArgsInfo.vf_arg[0];
     }
     
     
@@ -101,9 +102,12 @@ namespace clitk
     // Templated members
     //----------------------------------------  
     template <unsigned int Dimension,unsigned int Components> void ReadVectorFields(void);
-    template <unsigned int Dimension,unsigned int Components> void ProcessVectorFields(std::vector< typename itk::Image<itk::Vector<float, Components>, Dimension>::Pointer > dvfs, char** filenames);
-    template <unsigned int Dimension> void UpdateWithDim( std::vector<typename itk::Image<itk::Vector<float, Dimension>, Dimension>::Pointer > dvfs,  std::vector<std::string> filenames);
-    
+    template <unsigned int Dimension,unsigned int Components> void ProcessVectorFields(std::vector< typename itk::Image<itk::Vector<double, Components>, Dimension>::Pointer > dvfs, char** filenames);
+    template <unsigned int Dimension> void UpdateDVFWithDim( std::vector<typename itk::Image<itk::Vector<ValueType, Dimension>, Dimension>::Pointer > dvfs,  std::vector<std::string> filenames);
+    template <unsigned int Dimension,unsigned int Components> void ReadCoefficientImages(void);
+    template <unsigned int Dimension,unsigned int Components> void ProcessCoefficientImages(std::vector< typename itk::Image<itk::Vector<double, Components>, Dimension>::Pointer > dvfs, char** filenames);
+    template <unsigned int Dimension> void UpdateCoeffsWithDim( std::vector<typename itk::Image<itk::Vector<ValueType, Dimension>, Dimension>::Pointer > dvfs,  std::vector<std::string> filenames);
+    template<unsigned int Dimension> void BuildPointLists(std::vector<std::string>& filenames);
 
     //----------------------------------------  
     // Data members
@@ -111,11 +115,14 @@ namespace clitk
     args_info_clitkCalculateTRE m_ArgsInfo;
     bool m_Verbose;
     std::string m_InputFileName;
+    unsigned int m_NumberOfFields;
+    unsigned int m_NumberOfLists;
+    unsigned int m_NumberOfPoints;
 
   };
 
 
-} // end namespace clitk
+} // end namespace clitk 
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "clitkCalculateTREGenericFilter.txx"