X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fsrc%2FbbPackRecalageCalculateVectorBox.cxx;h=ae3c1666780584594d0b72ff873ae54ad1664f8a;hb=9b89ece57878a559b17dd54f884720b6eea395ef;hp=0290fcef7363e675eca122c7fdff9eef3c3a5830;hpb=2f92faf9b9fd4d6e5f557dbbf5094910c0addd6e;p=creaRigidRegistration.git

diff --git a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx
index 0290fce..ae3c166 100644
--- a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx
+++ b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx
@@ -11,23 +11,26 @@ BBTK_BLACK_BOX_IMPLEMENTATION(CalculateVectorBox,bbtk::AtomicBlackBox);
 void CalculateVectorBox::Process()
 {
 	
-    if(bbGetInputLabels1()[0].compare("") != 0)
+	if(!bbGetInputPointsX1().empty() && !bbGetInputPointsX2().empty())
 	{
-		//std::vector<float> newX1;
-		//newX1.push_back((float)bbGetInputPointsX1()[0]);
-		std::cout << "Points for first vector: " << bbGetInputPointsX1()[0] << " " << bbGetInputPointsX1()[1] << std::endl;
-		//std::vector<float> newX2;
-		//newX2.push_back((float)bbGetInputPointsX2()[0]);
+		//Checks that all the vector points are defined
+		if(bbGetInputPointsX1()[1] != NULL && bbGetInputPointsX2()[1] != NULL)
+		{
+			_vector->SetData(bbGetInputPointsX1(), bbGetInputPointsX2(), bbGetInputPointsY1(), bbGetInputPointsY2(), bbGetInputPointsZ1(), bbGetInputPointsZ2());
+			_vector->Run();
+
+			bbSetOutputOrigin(_vector->GetOrigin());
+			bbSetOutputOriginReslicer(_vector->GetOriginReslicer());
+			bbSetOutputOutAngle(_vector->GetAngle());
+		}
 	}
 }
 void CalculateVectorBox::bbUserSetDefaultValues()
 {
- 
-//  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX  
-//    Here we initialize the input 'In' to 0 
-	/*
-	std::vector<std::string> nuevo("","");
-	bbSetInputLabels1(nuevo);*/
+	_vector = new VectorMath();
+	std::vector<int> nullVector;
+	bbSetInputPointsX1(nullVector);
+	bbSetInputPointsX2(nullVector);	
 }
 void CalculateVectorBox::bbUserInitializeProcessing()
 {