X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FTransformer3D.h;h=3879509af07d6509913b26260653709e40ded23e;hb=7051738fb1c92724bd6d15907edc4d517527a3b2;hp=7f84d53594e6fd50b15aad3fc648dc71d850b8dc;hpb=79c2db16fed4560c62c91127e2ea4a882d162cd7;p=creaRigidRegistration.git

diff --git a/lib/Transformer3D.h b/lib/Transformer3D.h
index 7f84d53..3879509 100644
--- a/lib/Transformer3D.h
+++ b/lib/Transformer3D.h
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------      */                                                                    
+
 
 #ifndef Transformer3D_h
 #define Transformer3D_h
@@ -10,12 +36,25 @@ public:
 	Transformer3D();
     ~Transformer3D();
 	void SetTransform(vtkTransform *transform);
-	void SetCenterPoint(std::vector<int> point);	
+	void SetRotationAxis(double* axis);
+	void SetFirstTranslation(double* first);
+	void SetSecondTranslation(double* second);
+	void SetSecondRotationAxis(double* axis);
+	void SetAngle(double angle);
+	void SetSecondAngle(double angle);
+	void SetScale(double scale);
 	void Run();
 	
     vtkTransform *GetResult();
+	vtkTransform *GetFirstResult();
 private:
-	std::vector<int> _centerPoint;
+	double _scale;
+	double _rotationAxis[3];
+	double _secondRotationAxis[3];
+	double _firstPoint[3];
+	double _secondPoint[3];
+	double _angle;
+	double _secondAngle;
 	
 	vtkTransform *_transform;
 };