X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fsrc%2FbbPackRecalageCalculateVectorBox.cxx;h=0891bde5ccecb0060e0d1f3fd231580c107ceda7;hb=1b82b60c6337722f1a97bc8f7d6eadcc90352017;hp=ae3c1666780584594d0b72ff873ae54ad1664f8a;hpb=85c8838df7f9adbcb101fd6c6b4005dbfad325d3;p=creaRigidRegistration.git diff --git a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx index ae3c166..0891bde 100644 --- a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx +++ b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx @@ -9,25 +9,24 @@ namespace bbPackRecalage BBTK_ADD_BLACK_BOX_TO_PACKAGE(PackRecalage,CalculateVectorBox) BBTK_BLACK_BOX_IMPLEMENTATION(CalculateVectorBox,bbtk::AtomicBlackBox); void CalculateVectorBox::Process() -{ - +{ if(!bbGetInputPointsX1().empty() && !bbGetInputPointsX2().empty()) { //Checks that all the vector points are defined - if(bbGetInputPointsX1()[1] != NULL && bbGetInputPointsX2()[1] != NULL) + if(bbGetInputPointsX1()[1] != 0 && bbGetInputPointsX2()[1] != 0) { - _vector->SetData(bbGetInputPointsX1(), bbGetInputPointsX2(), bbGetInputPointsY1(), bbGetInputPointsY2(), bbGetInputPointsZ1(), bbGetInputPointsZ2()); - _vector->Run(); + //_vector->SetData(bbGetInputPointsX1(), bbGetInputPointsX2(), bbGetInputPointsY1(), bbGetInputPointsY2(), bbGetInputPointsZ1(), bbGetInputPointsZ2()); + //_vector->Run(); - bbSetOutputOrigin(_vector->GetOrigin()); - bbSetOutputOriginReslicer(_vector->GetOriginReslicer()); - bbSetOutputOutAngle(_vector->GetAngle()); + //bbSetOutputOrigin(_vector->GetOrigin()); + //bbSetOutputOriginReslicer(_vector->GetOriginReslicer()); + //bbSetOutputOutAngle(_vector->GetAngle()); } } } void CalculateVectorBox::bbUserSetDefaultValues() { - _vector = new VectorMath(); + _vector = new PlanesOperations(); std::vector nullVector; bbSetInputPointsX1(nullVector); bbSetInputPointsX2(nullVector);