X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Lin2d.cpp;h=a59c5b4ea0fa801faa8ba7eb54ff97e3fb6afecf;hb=9e869ede4d8c56262bb20534543c2bf56cd6a91b;hp=1e902f4b5fd07e31304dda01b852b1028eba7852;hpb=8dc74f82810d5f597b78633b457efb0ef4f89f9f;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Lin2d.cpp b/src/GeomAPI/GeomAPI_Lin2d.cpp index 1e902f4b5..a59c5b4ea 100644 --- a/src/GeomAPI/GeomAPI_Lin2d.cpp +++ b/src/GeomAPI/GeomAPI_Lin2d.cpp @@ -28,29 +28,29 @@ GeomAPI_Lin2d::GeomAPI_Lin2d(const double theStartX, const double theStartY, con { } -GeomAPI_Lin2d::GeomAPI_Lin2d(const boost::shared_ptr& theStart, - const boost::shared_ptr& theEnd) +GeomAPI_Lin2d::GeomAPI_Lin2d(const std::shared_ptr& theStart, + const std::shared_ptr& theEnd) : GeomAPI_Interface(newLine2d(theStart->x(), theStart->y(), theEnd->x(), theEnd->y())) { } -double GeomAPI_Lin2d::distance(const boost::shared_ptr& theOther) const +double GeomAPI_Lin2d::distance(const std::shared_ptr& theOther) const { return MY_LIN2D->Distance(theOther->impl()); } -const boost::shared_ptr GeomAPI_Lin2d::intersect( - const boost::shared_ptr& theLine) const +const std::shared_ptr GeomAPI_Lin2d::intersect( + const std::shared_ptr& theLine) const { IntAna2d_AnaIntersection anInter(*MY_LIN2D, theLine->impl()); if (!anInter.IsDone() || anInter.IsEmpty()) - return boost::shared_ptr(); + return std::shared_ptr(); const gp_Pnt2d& aResult = anInter.Point(1).Value(); - return boost::shared_ptr(new GeomAPI_Pnt2d(aResult.X(), aResult.Y())); + return std::shared_ptr(new GeomAPI_Pnt2d(aResult.X(), aResult.Y())); } -const boost::shared_ptr GeomAPI_Lin2d::project( - const boost::shared_ptr& thePoint) const +const std::shared_ptr GeomAPI_Lin2d::project( + const std::shared_ptr& thePoint) const { const gp_XY& aDir = MY_LIN2D->Direction().XY(); const gp_XY& aLoc = MY_LIN2D->Location().XY(); @@ -58,10 +58,10 @@ const boost::shared_ptr GeomAPI_Lin2d::project( double aParam = aDir.Dot(aPnt - aLoc); gp_XY aResult = aLoc + aDir * aParam; - return boost::shared_ptr(new GeomAPI_Pnt2d(aResult.X(), aResult.Y())); + return std::shared_ptr(new GeomAPI_Pnt2d(aResult.X(), aResult.Y())); } -bool GeomAPI_Lin2d::isRight(const boost::shared_ptr& thePoint) const +bool GeomAPI_Lin2d::isRight(const std::shared_ptr& thePoint) const { const gp_XY& aDir = MY_LIN2D->Direction().XY(); const gp_XY& aLoc = MY_LIN2D->Location().XY(); @@ -69,3 +69,15 @@ bool GeomAPI_Lin2d::isRight(const boost::shared_ptr& thePoint) co return aDir.Crossed(aPnt - aLoc) > 0; } + + +std::shared_ptr GeomAPI_Lin2d::shiftedLocation(double theShift) const +{ + gp_Vec2d aVec = MY_LIN2D->Direction(); + aVec = aVec.GetNormal(); + aVec.Normalize(); + aVec.Reverse(); + aVec.Scale(theShift); + gp_Lin2d aLin = MY_LIN2D->Translated(aVec); + return std::shared_ptr(new GeomAPI_Pnt2d(aLin.Location().X(), aLin.Location().Y())); +}