X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Placement.cpp;h=4e29cdb305d6df989964137f3b9a8ecbba547c9d;hb=f5c7bb3100ed321392da42f61c2ab505833ec61a;hp=d2ab51bd555e31e6f16ef7b0b896bb97842eb4be;hpb=9aad36a6b453e73b05356af4662a66a32cb71f1e;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Placement.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Placement.cpp index d2ab51bd5..4e29cdb30 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Placement.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Placement.cpp @@ -24,27 +24,29 @@ #include #include -#define DEB_PLACEMENT 1 GeomAlgoAPI_Placement::GeomAlgoAPI_Placement( - std::shared_ptr theSourceSolid, - std::shared_ptr theDestSolid, - std::shared_ptr theSourceShape, - std::shared_ptr theDestShape, - bool theIsReverse, - bool theIsCentering) + std::shared_ptr theSourceSolid, + std::shared_ptr theDestSolid, + std::shared_ptr theSourceShape, + std::shared_ptr theDestShape, + bool theIsReverse, + bool theIsCentering, + bool theSimpleTransform) : myDone(false), - myShape(new GeomAPI_Shape()) + myShape(new GeomAPI_Shape()) { - build(theSourceSolid, theDestSolid, theSourceShape, theDestShape, theIsReverse, theIsCentering); + build(theSourceSolid, theDestSolid, theSourceShape, theDestShape, + theIsReverse, theIsCentering, theSimpleTransform); } void GeomAlgoAPI_Placement::build( - const std::shared_ptr& theSourceSolid, - const std::shared_ptr& theDestSolid, - const std::shared_ptr& theSourceShape, - const std::shared_ptr& theDestShape, - bool theIsReverse, - bool theIsCentering) + const std::shared_ptr& theSourceSolid, + const std::shared_ptr& theDestSolid, + const std::shared_ptr& theSourceShape, + const std::shared_ptr& theDestShape, + bool theIsReverse, + bool theIsCentering, + bool theSimpleTransform) { // Filling the parameters of the objects static const int aNbObjects = 2; @@ -82,6 +84,30 @@ void GeomAlgoAPI_Placement::build( hasDirection[i] = aSrcDstDirections[i].SquareMagnitude() >= Precision::SquareConfusion(); } + // Initial shapes + const TopoDS_Shape& aSourceShape = theSourceSolid->impl(); + const TopoDS_Shape& aDestShape = theDestSolid->impl(); + // Check the material of the solids to be on the correct side + BRepClass3d_SolidClassifier aClassifier; + static const double aTransStep = 10. * Precision::Confusion(); + if (hasNormal[0]) { + aClassifier.Load(aSourceShape); + gp_Pnt aPoint = aSrcDstPoints[0]; + aPoint.Translate(aSrcDstNormals[0] * aTransStep); + aClassifier.Perform(aPoint, Precision::Confusion()); + if ((aClassifier.State() == TopAbs_OUT && !theIsReverse) || + (aClassifier.State() == TopAbs_IN && theIsReverse)) + aSrcDstNormals[0].Reverse(); + } + if (hasNormal[1]) { + aClassifier.Load(aDestShape); + gp_Pnt aPoint = aSrcDstPoints[1]; + aPoint.Translate(aSrcDstNormals[1] * aTransStep); + aClassifier.Perform(aPoint, Precision::Confusion()); + if (aClassifier.State() == TopAbs_IN) + aSrcDstNormals[1].Reverse(); + } + // Calculate directions, which comply the normal, for vertices and edges if (!hasNormal[0] || !hasNormal[1]) { if (hasNormal[0] || hasNormal[1]) { // plane with line or vertex @@ -90,10 +116,10 @@ void GeomAlgoAPI_Placement::build( gp_Vec aVec = aSrcDstNormals[1 - anInd].Crossed(aSrcDstDirections[anInd]); if (aVec.SquareMagnitude() < Precision::SquareConfusion()) { // normal and direction are collinear aVec = aSrcDstNormals[1 - anInd].Crossed( - gp_Vec(aSrcDstPoints[1 - anInd], aSrcDstPoints[anInd])); + gp_Vec(aSrcDstPoints[1 - anInd], aSrcDstPoints[anInd])); if (aVec.SquareMagnitude() < Precision::SquareConfusion()) { // normal and points direction are collinear if (Abs(aSrcDstNormals[1 - anInd].Y()) >= Precision::Confusion() || - Abs(aSrcDstNormals[1 - anInd].Z()) >= Precision::Confusion()) + Abs(aSrcDstNormals[1 - anInd].Z()) >= Precision::Confusion()) aVec = gp::DX(); else aVec = gp::DY(); @@ -111,7 +137,7 @@ void GeomAlgoAPI_Placement::build( aVec = aSrcDstDirections[0].Crossed(gp_Vec(aSrcDstPoints[0], aSrcDstPoints[1])); if (aVec.SquareMagnitude() < Precision::SquareConfusion()) { // lines are equal if (Abs(aSrcDstDirections[0].Y()) >= Precision::Confusion() || - Abs(aSrcDstDirections[0].Z()) >= Precision::Confusion()) + Abs(aSrcDstDirections[0].Z()) >= Precision::Confusion()) aVec = gp::DX(); else aVec = gp::DY(); @@ -119,8 +145,10 @@ void GeomAlgoAPI_Placement::build( } aSrcDstNormals[0] = aSrcDstDirections[0].Crossed(aVec); aSrcDstNormals[0].Normalize(); - aSrcDstNormals[1] = aSrcDstDirections[1].Crossed(aVec).Reversed(); + aSrcDstNormals[1] = aSrcDstDirections[1].Crossed(aVec); aSrcDstNormals[1].Normalize(); + if (aSrcDstDirections[0].Dot(aSrcDstDirections[1]) < -Precision::Confusion()) + aSrcDstNormals[1].Reverse(); } else if (!hasDirection[0] && !hasDirection[1]) { // point - point aSrcDstNormals[0] = gp_Vec(aSrcDstPoints[0], aSrcDstPoints[1]); aSrcDstNormals[0].Normalize(); @@ -131,7 +159,7 @@ void GeomAlgoAPI_Placement::build( aVec.Cross(aSrcDstDirections[anInd]); if (aVec.SquareMagnitude() < Precision::SquareConfusion()) { // point is on line if (Abs(aSrcDstDirections[1 - anInd].Y()) >= Precision::Confusion() || - Abs(aSrcDstDirections[1 - anInd].Z()) >= Precision::Confusion()) + Abs(aSrcDstDirections[1 - anInd].Z()) >= Precision::Confusion()) aVec = gp::DX(); else aVec = gp::DY(); @@ -142,35 +170,14 @@ void GeomAlgoAPI_Placement::build( } } - // Initial shapes - const TopoDS_Shape& aSourceShape = theSourceSolid->impl(); - const TopoDS_Shape& aDestShape = theDestSolid->impl(); + // Reverse the normal if it was not done before + if (!hasNormal[0] && theIsReverse) + aSrcDstNormals[0].Reverse(); // Calculate transformation gp_Trsf aTrsf; gp_Vec aSrcDir = aSrcDstNormals[0]; gp_Vec aDstDir = aSrcDstNormals[1]; - // Check the material of the solids to be on the correct side - BRepClass3d_SolidClassifier aClassifier; - static const double aTransStep = 10. * Precision::Confusion(); - if (hasNormal[0]) { - aClassifier.Load(aSourceShape); - gp_Pnt aPoint = aSrcDstPoints[0]; - aPoint.Translate(aSrcDir * aTransStep); - aClassifier.Perform(aPoint, Precision::Confusion()); - if ((aClassifier.State() == TopAbs_OUT && !theIsReverse) || - (aClassifier.State() == TopAbs_IN && theIsReverse)) - aSrcDir.Reverse(); - } else if (theIsReverse) - aSrcDir.Reverse(); - if (hasNormal[1]) { - aClassifier.Load(aDestShape); - gp_Pnt aPoint = aSrcDstPoints[1]; - aPoint.Translate(aDstDir * aTransStep); - aClassifier.Perform(aPoint, Precision::Confusion()); - if (aClassifier.State() == TopAbs_IN) - aDstDir.Reverse(); - } // Calculate rotation gp_Quaternion aRot(aSrcDir, aDstDir); aTrsf.SetRotation(aRot); @@ -183,27 +190,31 @@ void GeomAlgoAPI_Placement::build( gp_Vec aTrans = aDstLoc - aSrcLoc; aTrsf.SetTransformation(aRot, aTrans); - // Transform the shape with copying it - BRepBuilderAPI_Transform* aBuilder = new BRepBuilderAPI_Transform(aSourceShape, aTrsf, true); - if(aBuilder) { - setImpl(aBuilder); - myDone = aBuilder->IsDone() == Standard_True; - if (myDone) { - TopoDS_Shape aResult = aBuilder->Shape(); - // fill data map to keep correct orientation of sub-shapes - for (TopExp_Explorer Exp(aResult,TopAbs_FACE); Exp.More(); Exp.Next()) { - std::shared_ptr aCurrentShape(new GeomAPI_Shape()); - aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current())); - myMap.bind(aCurrentShape, aCurrentShape); + if (theSimpleTransform) { // just add transformation + TopLoc_Location aDelta(aTrsf); + TopoDS_Shape aResult = aSourceShape.Moved(aDelta); + myShape->setImpl(new TopoDS_Shape(aResult)); + // store the accumulated information about the result and this delta + //myTrsf = std::shared_ptr(new GeomAPI_Trsf(new gp_Trsf(aTrsf * aSourceShape.Location().Transformation()))); + myTrsf = std::shared_ptr(new GeomAPI_Trsf(new gp_Trsf(aTrsf))); + myDone = true; // it is allways true for simple transformation generation + } else { // internal rebuild of the shape + // Transform the shape with copying it + BRepBuilderAPI_Transform* aBuilder = new BRepBuilderAPI_Transform(aSourceShape, aTrsf, true); + if(aBuilder) { + setImpl(aBuilder); + myDone = aBuilder->IsDone() == Standard_True; + if (myDone) { + TopoDS_Shape aResult = aBuilder->Shape(); + // fill data map to keep correct orientation of sub-shapes + for (TopExp_Explorer Exp(aResult,TopAbs_FACE); Exp.More(); Exp.Next()) { + std::shared_ptr aCurrentShape(new GeomAPI_Shape()); + aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current())); + myMap.bind(aCurrentShape, aCurrentShape); + } + myShape->setImpl(new TopoDS_Shape(aResult)); + myMkShape = new GeomAlgoAPI_MakeShape (aBuilder); } -#ifdef DEB_PLACEMENT - int aNum = myMap.size(); - cout << "MAP of Oriented shapes =" << aNum <setImpl(new TopoDS_Shape(aResult)); - myMkShape = new GeomAlgoAPI_MakeShape (aBuilder); } } } @@ -211,8 +222,11 @@ void GeomAlgoAPI_Placement::build( //============================================================================ const bool GeomAlgoAPI_Placement::isValid() const { - BRepCheck_Analyzer aChecker(myShape->impl()); - return (aChecker.IsValid() == Standard_True); + if (myShape.get()) { // only for not-simple transform + BRepCheck_Analyzer aChecker(myShape->impl()); + return (aChecker.IsValid() == Standard_True); + } + return true; } //============================================================================ @@ -247,9 +261,14 @@ GeomAlgoAPI_MakeShape * GeomAlgoAPI_Placement::makeShape() const return myMkShape; } +std::shared_ptr GeomAlgoAPI_Placement::transformation() const +{ + return myTrsf; +} + //============================================================================ GeomAlgoAPI_Placement::~GeomAlgoAPI_Placement() { - if (myImpl) + if (!empty()) myMap.clear(); -} \ No newline at end of file +}