]> Creatis software - creaRigidRegistration.git/commitdiff
*** empty log message ***
authortrillos <trillos>
Mon, 16 Nov 2009 08:33:37 +0000 (08:33 +0000)
committertrillos <trillos>
Mon, 16 Nov 2009 08:33:37 +0000 (08:33 +0000)
lib/Transformer.cxx
lib/Transformer.h

index 3fa55077343044b8af26c3fcda458be4c0e15871..8c34e09933102e2fc91fe74560ab54d84326fd10 100644 (file)
@@ -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();
 }
index 54fdbfe59d51b8631452439cbdc1c187cd94abac..327eae60633513f9e75a2bec0fabcaefd58e279c 100644 (file)
@@ -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;