#2810 crea RigidRegistration Bug New Normal - update Transform3D3PointsBox

[creaRigidRegistration.git] / lib / Transformer3D.cxx

diff --git a/lib/Transformer3D.cxx b/lib/Transformer3D.cxx
index 36cb6a9c0b1ba09282c43f66171f5058f62876f1..f948f7ddf94392c185a2fa4b5170c4255ddeeca8 100644 (file)
--- a/lib/Transformer3D.cxx
+++ b/lib/Transformer3D.cxx
@@ -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.
+# ------------------------------------------------------------------------      */                                                                    
+
 
 #include "Transformer3D.h"
 #include "vtkMatrix4x4.h"
@@ -95,6 +121,14 @@ void Transformer3D::SetSecondAngle(double angle)
 }
 
 
+void Transformer3D::SetScale(double scale)
+{
+    _scale=scale;
+}
+
+
+
+
 /*
        GETS THE RESULTANT TRANSFORM
 */
@@ -109,14 +143,9 @@ vtkTransform *Transformer3D::GetResult()
 vtkTransform *Transformer3D::GetFirstResult()
 {
        _transform->Identity();
-
        _transform->Translate(-_firstPoint[0], -_firstPoint[1], -_firstPoint[2]);
-
        _transform->RotateWXYZ(_angle, _rotationAxis[0], _rotationAxis[1], _rotationAxis[2]);
-
        _transform->Translate(_secondPoint[0], _secondPoint[1], _secondPoint[2]);
-
-       
        _transform->Update();   
        return _transform;
 }
@@ -128,20 +157,17 @@ void Transformer3D::Run()
 {      
        //Cleans the transformation matrix
        _transform->Identity();
-
        //Make all transformations in postmultiply mode
        _transform->PostMultiply();
-
        //Acomodate in 0,0,0 according to the first point of the second vector
        _transform->Translate(-_secondPoint[0], -_secondPoint[1], -_secondPoint[2]);
-
        _transform->RotateWXYZ(_angle, _rotationAxis[0], _rotationAxis[1], _rotationAxis[2]);
-
        _transform->RotateWXYZ(_secondAngle, _secondRotationAxis[0], _secondRotationAxis[1], _secondRotationAxis[2]);
-
+printf("EED Transformer3D::Run %f %f\n", _angle, _secondAngle);
+       _transform->Scale(_scale,_scale,_scale);
        //Acommodate according to the first point of the first vector
        _transform->Translate(_firstPoint[0], _firstPoint[1], _firstPoint[2]);  
-       
        _transform->Inverse();
        _transform->Update();
 }
+