X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Ax3.cpp;h=c2de37372339ad686f71e466173a7ae19a80f61f;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=892869a4c9a7f4593af69285648478443bb49e07;hpb=7b9e257dacdb4564754c3bcd0c35817e73a3989c;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Ax3.cpp b/src/GeomAPI/GeomAPI_Ax3.cpp index 892869a4c..c2de37372 100644 --- a/src/GeomAPI/GeomAPI_Ax3.cpp +++ b/src/GeomAPI/GeomAPI_Ax3.cpp @@ -15,7 +15,7 @@ #include -#define MY_AX3 static_cast(myImpl) +#define MY_AX3 implPtr() GeomAPI_Ax3::GeomAPI_Ax3() @@ -26,8 +26,8 @@ GeomAPI_Ax3::GeomAPI_Ax3() GeomAPI_Ax3::GeomAPI_Ax3(std::shared_ptr theOrigin, std::shared_ptr theDirX, std::shared_ptr theNorm) -: GeomAPI_Interface(new gp_Ax3(theOrigin->impl(), - theNorm->impl(), +: GeomAPI_Interface(new gp_Ax3(theOrigin->impl(), + theNorm->impl(), theDirX->impl())) { } @@ -67,14 +67,14 @@ std::shared_ptr GeomAPI_Ax3::dirY() const return std::shared_ptr(new GeomAPI_Dir(aDir.X(), aDir.Y(), aDir.Z())); } -void GeomAPI_Ax3::setNorm(const std::shared_ptr& theNorm) +void GeomAPI_Ax3::setNormal(const std::shared_ptr& theNorm) { gp_Ax1 aAx1 = MY_AX3->Axis(); aAx1.SetDirection(theNorm->impl()); MY_AX3->SetAxis(aAx1); } -std::shared_ptr GeomAPI_Ax3::norm() const +std::shared_ptr GeomAPI_Ax3::normal() const { gp_Dir aDir = MY_AX3->Axis().Direction(); return std::shared_ptr(new GeomAPI_Dir(aDir.X(),aDir.Y(),aDir.Z())); @@ -102,4 +102,4 @@ std::shared_ptr GeomAPI_Ax3::to2D(double theX, double theY, doubl double aX = aVec.X() * aXDir.X() + aVec.Y() * aXDir.Y() + aVec.Z() * aXDir.Z(); double aY = aVec.X() * aYDir.X() + aVec.Y() * aYDir.Y() + aVec.Z() * aYDir.Y(); return std::shared_ptr(new GeomAPI_Pnt2d(aX, aY)); -} \ No newline at end of file +}