X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fsrc%2FbbPackRecalageTransform2DBox.h;h=52288f8b00deb008049448d6bb7b994811d07f8f;hb=86c3482ce714b8d4201c8d819a10b59e4e4440c4;hp=6a4ea9d2014b33c53c8c559ab5604131b8f7950b;hpb=caf70b171caba0cb8c1e4c00688b27844f93e31b;p=creaRigidRegistration.git

diff --git a/PackRecalage/src/bbPackRecalageTransform2DBox.h b/PackRecalage/src/bbPackRecalageTransform2DBox.h
index 6a4ea9d..52288f8 100644
--- a/PackRecalage/src/bbPackRecalageTransform2DBox.h
+++ b/PackRecalage/src/bbPackRecalageTransform2DBox.h
@@ -18,6 +18,9 @@ class bbPackRecalage_EXPORT Transform2DBox
 		/*Point(x,y) -> Rotation Center*/
 		BBTK_DECLARE_INPUT(CenterPoint,std::vector<int>);
 
+		/*Vector(x,y) -> Axis Rotation Vector*/
+		BBTK_DECLARE_INPUT(Axis,std::vector<double>);
+
 
 		/*Rotation angle*/
 		BBTK_DECLARE_INPUT(Angle,double);
@@ -32,6 +35,9 @@ class bbPackRecalage_EXPORT Transform2DBox
 
 		/*Scalation to be done int the z axis*/
 		BBTK_DECLARE_INPUT(ScaleZ,double);
+
+		/*3D transformation on or off option*/
+		BBTK_DECLARE_INPUT(3D,bool);
 		
 		/*Resultant vtkTransform*/
 		BBTK_DECLARE_OUTPUT(Out, vtkLinearTransform*);
@@ -41,6 +47,9 @@ class bbPackRecalage_EXPORT Transform2DBox
 		
 		/*Class in charge of making the transformations*/
 		Transformer *transformer;
+
+		/*Boolean that defines if the transformation is in 3D or not. True = Transfomation is in 3D*/
+		bool _3D;
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(Transform2DBox,bbtk::AtomicBlackBox);
@@ -49,11 +58,13 @@ BBTK_AUTHOR("va-perez@uniandes.edu.co");
 BBTK_DESCRIPTION("Given 2 points and an angle, it calculates the vtkTransform result after aplying the transformations, using the first point as base of the transformation");
 BBTK_CATEGORY("filter");
 BBTK_INPUT(Transform2DBox,CenterPoint,"Point (x,y,z) -> Rotation Center",std::vector<int>,"");
+BBTK_INPUT(Transform2DBox,Axis,"Vector (x,y,z) -> Axis Rotation Vector. Used only on 3D transformations.",std::vector<double>,"");
 BBTK_INPUT(Transform2DBox,Angle,"Rotation Angle",double,"");
 BBTK_INPUT(Transform2DBox,ScaleX,"Scale in X",double,"");
 BBTK_INPUT(Transform2DBox,ScaleY,"Scale in Y",double,"");
 BBTK_INPUT(Transform2DBox,ScaleZ,"Scale in Z",double,"");
-BBTK_OUTPUT(Transform2DBox,Out,"vtk Transform filter ",vtkLinearTransform*,"");
+BBTK_INPUT(Transform2DBox,3D,"Boolean that defines if the transformation is in 3D or not. True = Transfomation is in 3D ",bool,"");
+BBTK_OUTPUT(Transform2DBox,Out,"Linear Transform filter",vtkLinearTransform*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(Transform2DBox);
 }
 // EO namespace bbPackRecalage