From: trillos <trillos>
Date: Thu, 17 Dec 2009 15:12:45 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaRigidRegistration.git;a=commitdiff_plain;h=ad5d367dceea1494549e58391034956ed87ec31b

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

diff --git a/lib/Transformer.cxx b/lib/Transformer.cxx
index 47b3980..c901362 100644
--- a/lib/Transformer.cxx
+++ b/lib/Transformer.cxx
@@ -92,16 +92,33 @@ vtkTransform *Transformer::GetResult()
 	MAKES THE TRANSFORMATIONS
 */
 void Transformer::Run()
-{	
-	
+{
 	_transform->Identity();
 	_transform->PostMultiply();
-	_transform->Translate(-_centerPoint[0], -_centerPoint[1], -_centerPoint[2]);
+	if(_centerPoint.size() < 3)
+	{
+		_transform->Translate(-_centerPoint[0], -_centerPoint[1], 0);
+		std::cout << "NTU Transformer2D Center Points: " << _centerPoint[0] << " " << _centerPoint[1] << std::endl;
+	}
+	else
+	{
+		_transform->Translate(-_centerPoint[0], -_centerPoint[1], -_centerPoint[2]);
+		std::cout << "NTU Transformer2D Center Points: " << _centerPoint[0] << " " << _centerPoint[1] << " " << _centerPoint[2] << std::endl;
+	}
 
 	_transform->RotateWXYZ(_angle, 0, 0, 1);
-	_transform->Scale(_scaleX, _scaleY,_scaleZ);
-	
-		
+	//std::cout << "NTU Transformer2D Angle: " << _angle << std::endl;
+
+	if(_scaleX < 0 || _scaleY < 0 || _scaleZ < 0)
+	{
+		_transform->Scale(100, 100, 100);
+		//std::cout << "NTU Transformer2D Scale: " << _scaleX << " " << _scaleY << " " << _scaleZ << std::endl;
+	}
+	else
+	{
+		_transform->Scale(_scaleX, _scaleY,_scaleZ);
+		//std::cout << "NTU Transformer2D Scale: " << _scaleX << " " << _scaleY << " " << _scaleZ << std::endl;
+	}		
 	_transform->Inverse();
 	_transform->Update();
 }