X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_XYZ.cpp;h=22588c1ed63e303885758c2868472c2e5cd9635b;hb=3d28bcbab2f3ed0e40295e64f4e836caebc19fca;hp=30c246323a26d18feb7e9e8b9117816852c4b5b9;hpb=c52423b158d7e2bae396c62e4fe62e7e8f78c381;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_XYZ.cpp b/src/GeomAPI/GeomAPI_XYZ.cpp
index 30c246323..22588c1ed 100644
--- a/src/GeomAPI/GeomAPI_XYZ.cpp
+++ b/src/GeomAPI/GeomAPI_XYZ.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_XYZ.cpp
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -6,11 +8,12 @@
 
 #include<gp_XYZ.hxx>
 
-#define MY_XYZ static_cast<gp_XYZ*>(myImpl)
+#define MY_XYZ implPtr<gp_XYZ>()
 
 GeomAPI_XYZ::GeomAPI_XYZ(const double theX, const double theY, const double theZ)
-  : GeomAPI_Interface(new gp_XYZ(theX, theY, theZ))
-{}
+    : GeomAPI_Interface(new gp_XYZ(theX, theY, theZ))
+{
+}
 
 double GeomAPI_XYZ::x() const
 {
@@ -42,17 +45,44 @@ void GeomAPI_XYZ::setZ(const double theZ)
   return MY_XYZ->SetZ(theZ);
 }
 
-const boost::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::added(
-  const boost::shared_ptr<GeomAPI_XYZ>& theArg)
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::added(
+    const std::shared_ptr<GeomAPI_XYZ>& theArg)
 {
-  boost::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() + theArg->x(),
-    MY_XYZ->Y() + theArg->y(), MY_XYZ->Z() + theArg->z()));
+  std::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() + theArg->x(),
+  MY_XYZ->Y() + theArg->y(), MY_XYZ->Z() + theArg->z()));
   return aResult;
 }
 
-const boost::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::multiplied(const double theArg)
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::decreased(
+    const std::shared_ptr<GeomAPI_XYZ>& theArg)
 {
-  boost::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() * theArg,
-    MY_XYZ->Y() * theArg, MY_XYZ->Z() * theArg));
+  std::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() - theArg->x(),
+  MY_XYZ->Y() - theArg->y(), MY_XYZ->Z() - theArg->z()));
   return aResult;
 }
+
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::multiplied(const double theArg)
+{
+  std::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() * theArg,
+  MY_XYZ->Y() * theArg, MY_XYZ->Z() * theArg));
+  return aResult;
+}
+
+double GeomAPI_XYZ::dot(const std::shared_ptr<GeomAPI_XYZ>& theArg) const
+{
+  return MY_XYZ->Dot(theArg->impl<gp_XYZ>());
+}
+
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::cross(
+    const std::shared_ptr<GeomAPI_XYZ>& theArg) const
+{
+  gp_XYZ aResult = MY_XYZ->Crossed(theArg->impl<gp_XYZ>());
+  return std::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z()));
+}
+
+double GeomAPI_XYZ::distance(const std::shared_ptr<GeomAPI_XYZ>& theOther) const
+{
+  gp_XYZ aResult(theOther->x() - x(), theOther->y() - y(), theOther->z() - z());
+  return aResult.Modulus();
+}
+