*** empty log message ***

[creaRigidRegistration.git] / lib / Transformer.cxx

diff --git a/lib/Transformer.cxx b/lib/Transformer.cxx
index de53958696118363be844d93da39017921e52f88..3fa55077343044b8af26c3fcda458be4c0e15871 100644 (file)
--- a/lib/Transformer.cxx
+++ b/lib/Transformer.cxx
@@ -46,6 +46,14 @@ void Transformer::SetCenterPoint(std::vector<int> point)
     _centerPoint=point;
 }
 
+/*
+       SETS AXIS POINT
+*/
+void Transformer::SetAxis(std::vector<double> axis)
+{
+    _transformAxis=axis;
+}
+
 /*
        SETS THE ANGLE
 */
@@ -91,11 +99,24 @@ vtkTransform *Transformer::GetResult()
 /*
        MAKES THE TRANSFORMATIONS
 */
-void Transformer::Run()
+void Transformer::Run(bool _3D)
 {      
        _transform->Identity();
        _transform->Translate(_centerPoint[0], _centerPoint[1], _centerPoint[2]);
+
+       std::cout << "Transformer: Center points: X = " <<  _centerPoint[0] << " Y = " << _centerPoint[1] << " Z = " << _centerPoint[2] << std::endl;
+       std::cout << "Transformer Angle: " << _angle << std::endl;
+
        _transform->Scale(_scaleX, _scaleY,_scaleZ);
-       _transform->RotateWXYZ(_angle, 0, 0, 1);
+       if(_3D)
+       {
+               _transform->RotateWXYZ(_angle, _transformAxis[0], _transformAxis[1], _transformAxis[2]);
+               std::cout << "Transformer 3D Version" << std::endl;
+       }
+       else
+       {
+               _transform->RotateWXYZ(_angle, 0, 0, 1);
+       }
+       
        _transform->Update();
 }