X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkTransformUtilities.h;h=3bdf22026ee0ab969a5fe8f6274db3a0fd4fa2e3;hb=bcd98a7cb45fd4c3b5a41bc8cefa89f5790aca27;hp=d4a947c088be8052c366cec0ba3a68fccd1b1fdf;hpb=0083c3fb2c66812489631c7551709d121de51625;p=clitk.git

diff --git a/common/clitkTransformUtilities.h b/common/clitkTransformUtilities.h
index d4a947c..3bdf220 100644
--- a/common/clitkTransformUtilities.h
+++ b/common/clitkTransformUtilities.h
@@ -1,3 +1,21 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.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
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
+
 #ifndef CLITKTRANSFORMUTILITIES_H
 #define CLITKTRANSFORMUTILITIES_H
 #include "itkMatrix.h"
@@ -13,10 +31,16 @@ namespace clitk
   //Declarations
   //============================================================================
   itk::Matrix<double, 3, 3> GetForwardAffineMatrix2D(itk::Array<double> transformParameters);
-  itk::Matrix<double, 3, 3> GetBackwardAffineMatrix2D(itk::Array<double> transformParameters);
   itk::Matrix<double, 4, 4> GetForwardAffineMatrix3D(itk::Array<double> transformParameters);
+  template <unsigned int Dimension > itk::Matrix<double, Dimension+1, Dimension+1> GetForwardAffineMatrix(itk::Array<double> transformParameters);
+
+  itk::Matrix<double, 3, 3> GetBackwardAffineMatrix2D(itk::Array<double> transformParameters);
   itk::Matrix<double, 4, 4> GetBackwardAffineMatrix3D(itk::Array<double> transformParameters);
+  template <unsigned int Dimension > itk::Matrix<double, Dimension+1, Dimension+1> GetBackwardAffineMatrix(itk::Array<double> transformParameters);
+
   itk::Matrix<double, 3, 3> GetRotationMatrix3D(itk::Array<double> rotationParameters);
+  itk::Matrix<double, 2, 2> GetRotationMatrix2D(itk::Array<double> rotationParameters);
+  template <unsigned int Dimension> itk::Matrix<double, Dimension, Dimension> GetRotationMatrix(itk::Array<double> rotationParameters);
   itk::Point<double, 3> GetRotatedPoint3D(itk::Array<double> rotationParameters, itk::Point<double, 3> input);
   itk::Matrix<double, 4, 4> GetCenteredRotationMatrix3D(itk::Array<double> rotationParameters,itk::Point<double,3> centerOfRotation);
   //   itk::Matrix<double, 4, 4> GetComposedMatrix3D(itk::Matrix<double, 4, 4> firstTransform, itk::Matrix<double, 4, 4> secondTransform);
@@ -60,25 +84,6 @@ namespace clitk
     return matrix;
   }
   
-  inline  itk::Matrix<double, 3, 3> GetBackwardAffineMatrix2D(itk::Array<double> transformParameters)
-  {
-    itk::Matrix<double, 3, 3> matrix;
-    //rotation part
-    matrix[0][0]=cos(transformParameters[0]);
-    matrix[0][1]=sin(transformParameters[0]);
-    matrix[1][0]=-sin(transformParameters[0]);
-    matrix[1][1]=cos(transformParameters[0]);
-    //translation part
-    matrix[0][2]=transformParameters[1];
-    matrix[1][2]=transformParameters[2];
-    //homogenize
-    matrix[2][0]=0.;
-    matrix[2][1]=0.;
-    matrix[2][2]=1.;
-    return matrix;
-  }
- 
- 
   inline  itk::Matrix<double, 4, 4> GetForwardAffineMatrix3D(itk::Array<double> transformParameters)
   {
     itk::Matrix<double, 4, 4> matrix;
@@ -105,6 +110,25 @@ namespace clitk
   }
  
  
+  inline  itk::Matrix<double, 3, 3> GetBackwardAffineMatrix2D(itk::Array<double> transformParameters)
+  {
+    itk::Matrix<double, 3, 3> matrix;
+    //rotation part
+    matrix[0][0]=cos(transformParameters[0]);
+    matrix[0][1]=sin(transformParameters[0]);
+    matrix[1][0]=-sin(transformParameters[0]);
+    matrix[1][1]=cos(transformParameters[0]);
+    //translation part
+    matrix[0][2]=transformParameters[1];
+    matrix[1][2]=transformParameters[2];
+    //homogenize
+    matrix[2][0]=0.;
+    matrix[2][1]=0.;
+    matrix[2][2]=1.;
+    return matrix;
+  }
+
+
   inline  itk::Matrix<double, 4, 4> GetBackwardAffineMatrix3D(itk::Array<double> transformParameters)
   {
     itk::Matrix<double, 4, 4> matrix;
@@ -145,9 +169,17 @@ namespace clitk
     matrix[2][2]= cos(rotationParameters[0])*cos(rotationParameters[1]);
     return matrix;
   }
- 
- 
- 
+
+  inline itk::Matrix<double, 2, 2> GetRotationMatrix2D(itk::Array<double> rotationParameters)
+  {
+    itk::Matrix<double, 2, 2> matrix;
+    matrix[0][0] = cos(rotationParameters[0]);
+    matrix[1][0] = sin(rotationParameters[0]);
+    matrix[0][1] = -matrix[1][0];
+    matrix[1][1] = matrix[0][0];
+    return matrix;
+  }
+
   //========================================================================================
   inline  itk::Point<double, 3> GetRotatedPoint3D(itk::Array<double> rotationParameters, itk::Point<double, 3> input)
   {