From: trillos <trillos>
Date: Mon, 16 Nov 2009 08:33:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~28
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaRigidRegistration.git;a=commitdiff_plain;h=ee36cca663d9492ba5582b3621c696db9fb2d803

*** empty log message ***
---

diff --git a/lib/Transformer.cxx b/lib/Transformer.cxx
index 3fa5507..8c34e09 100644
--- a/lib/Transformer.cxx
+++ b/lib/Transformer.cxx
@@ -46,14 +46,6 @@ void Transformer::SetCenterPoint(std::vector<int> point)
     _centerPoint=point;
 }
 
-/*
-	SETS AXIS POINT
-*/
-void Transformer::SetAxis(std::vector<double> axis)
-{
-    _transformAxis=axis;
-}
-
 /*
 	SETS THE ANGLE
 */
@@ -99,24 +91,13 @@ vtkTransform *Transformer::GetResult()
 /*
 	MAKES THE TRANSFORMATIONS
 */
-void Transformer::Run(bool _3D)
+void Transformer::Run()
 {	
 	_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);
-	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->RotateWXYZ(_angle, 0, 0, 1);
 	
 	_transform->Update();
 }
diff --git a/lib/Transformer.h b/lib/Transformer.h
index 54fdbfe..327eae6 100644
--- a/lib/Transformer.h
+++ b/lib/Transformer.h
@@ -11,17 +11,16 @@ public:
     ~Transformer();
 	void SetTransform(vtkTransform *transform);
 	void SetCenterPoint(std::vector<int> point);
-	void SetAxis(std::vector<double> axis);
 	void SetAngle(double angle);
 	void SetScaleX(double scaleX);
 	void SetScaleY(double scaleY);
 	void SetScaleZ(double scaleZ);
-	void Run(bool _3D);
+	void Run();
 	
     vtkTransform *GetResult();
 private:
 	std::vector<int> _centerPoint;
-	std::vector<double> _transformAxis;
+	
 	double _angle;
 	double _scaleX;
 	double _scaleY;