X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Dir.cpp;h=cbd8880a0977d0f4719a437897fcebbe47d3b591;hb=29bc47d2f0f38f132e4f578feec9a1d1c8e514fe;hp=c3ad12fb97a2421cee00f8ce53f44045cfbd1146;hpb=773b6bcbbd4a811340e699667014b13185f80dbc;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Dir.cpp b/src/GeomAPI/GeomAPI_Dir.cpp
index c3ad12fb9..cbd8880a0 100644
--- a/src/GeomAPI/GeomAPI_Dir.cpp
+++ b/src/GeomAPI/GeomAPI_Dir.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Dir.cpp
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -7,15 +9,17 @@
 
 #include <gp_Dir.hxx>
 
-#define MY_DIR static_cast<gp_Dir*>(myImpl)
+#define MY_DIR implPtr<gp_Dir>()
 
 GeomAPI_Dir::GeomAPI_Dir(const double theX, const double theY, const double theZ)
-  : GeomAPI_Interface(new gp_Dir(theX, theY, theZ))
-{}
+    : GeomAPI_Interface(new gp_Dir(theX, theY, theZ))
+{
+}
 
-GeomAPI_Dir::GeomAPI_Dir(const boost::shared_ptr<GeomAPI_XYZ>& theCoords)
-  : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z()))
-{}
+GeomAPI_Dir::GeomAPI_Dir(const std::shared_ptr<GeomAPI_XYZ>& theCoords)
+    : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z()))
+{
+}
 
 double GeomAPI_Dir::x() const
 {
@@ -32,7 +36,35 @@ double GeomAPI_Dir::z() const
   return MY_DIR->Z();
 }
 
-const boost::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::xyz() 
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::xyz()
+{
+  return std::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z()));
+}
+
+void GeomAPI_Dir::reverse()
+{
+  MY_DIR->Reverse();
+}
+
+double GeomAPI_Dir::dot(const std::shared_ptr<GeomAPI_Dir>& theArg) const
+{
+  return MY_DIR->Dot(theArg->impl<gp_Dir>());
+}
+
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::cross(
+    const std::shared_ptr<GeomAPI_Dir>& theArg) const
+{
+  gp_XYZ aResult = MY_DIR->XYZ().Crossed(theArg->impl<gp_Dir>().XYZ());
+  return std::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z()));
+}
+
+double GeomAPI_Dir::angle(const std::shared_ptr<GeomAPI_Dir>& theArg) const
+{
+  return MY_DIR->Angle(theArg->impl<gp_Dir>());
+}
+
+bool GeomAPI_Dir::isParallel(const std::shared_ptr<GeomAPI_Dir> theDir,
+                             const double theTolerance) const
 {
-  return boost::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z()));
+  return MY_DIR->IsParallel(theDir->impl<gp_Dir>(), theTolerance) == Standard_True;
 }