X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_XY.cpp;h=52561d580f4c1f92d7d8c3076136810e1450da2f;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=94341c31e95029759b616798bea65b2040427469;hpb=98be939e3a6c58498b6dd763301d3e5fa50bf397;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_XY.cpp b/src/GeomAPI/GeomAPI_XY.cpp
index 94341c31e..52561d580 100644
--- a/src/GeomAPI/GeomAPI_XY.cpp
+++ b/src/GeomAPI/GeomAPI_XY.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_XY.cpp
 // Created:     30 May 2014
 // Author:      Artem ZHIDKOV
@@ -6,11 +8,12 @@
 
 #include<gp_XY.hxx>
 
-#define MY_XY static_cast<gp_XY*>(myImpl)
+#define MY_XY implPtr<gp_XY>()
 
 GeomAPI_XY::GeomAPI_XY(const double theX, const double theY)
-  : GeomAPI_Interface(new gp_XY(theX, theY))
-{}
+    : GeomAPI_Interface(new gp_XY(theX, theY))
+{
+}
 
 double GeomAPI_XY::x() const
 {
@@ -32,32 +35,38 @@ void GeomAPI_XY::setY(const double theY)
   return MY_XY->SetY(theY);
 }
 
-const boost::shared_ptr<GeomAPI_XY> GeomAPI_XY::added(
-  const boost::shared_ptr<GeomAPI_XY>& theArg)
+const std::shared_ptr<GeomAPI_XY> GeomAPI_XY::added(const std::shared_ptr<GeomAPI_XY>& theArg)
+{
+  std::shared_ptr<GeomAPI_XY> aResult(new GeomAPI_XY(
+      MY_XY->X() + theArg->x(), MY_XY->Y() + theArg->y()));
+  return aResult;
+}
+
+const std::shared_ptr<GeomAPI_XY> GeomAPI_XY::decreased(
+    const std::shared_ptr<GeomAPI_XY>& theArg)
 {
-  boost::shared_ptr<GeomAPI_XY> aResult(
-    new GeomAPI_XY(MY_XY->X() + theArg->x(), MY_XY->Y() + theArg->y()));
+  std::shared_ptr<GeomAPI_XY> aResult(new GeomAPI_XY(
+      MY_XY->X() - theArg->x(), MY_XY->Y() - theArg->y()));
   return aResult;
 }
 
-const boost::shared_ptr<GeomAPI_XY> GeomAPI_XY::multiplied(const double theArg)
+const std::shared_ptr<GeomAPI_XY> GeomAPI_XY::multiplied(const double theArg)
 {
-  boost::shared_ptr<GeomAPI_XY> aResult(
-    new GeomAPI_XY(MY_XY->X() * theArg, MY_XY->Y() * theArg));
+  std::shared_ptr<GeomAPI_XY> aResult(new GeomAPI_XY(MY_XY->X() * theArg, MY_XY->Y() * theArg));
   return aResult;
 }
 
-double GeomAPI_XY::dot(const boost::shared_ptr<GeomAPI_XY>& theArg) const
+double GeomAPI_XY::dot(const std::shared_ptr<GeomAPI_XY>& theArg) const
 {
   return MY_XY->Dot(theArg->impl<gp_XY>());
 }
 
-double GeomAPI_XY::cross(const boost::shared_ptr<GeomAPI_XY>& theArg) const
+double GeomAPI_XY::cross(const std::shared_ptr<GeomAPI_XY>& theArg) const
 {
   return MY_XY->Crossed(theArg->impl<gp_XY>());
 }
 
-double GeomAPI_XY::distance(const boost::shared_ptr<GeomAPI_XY>& theOther) const
+double GeomAPI_XY::distance(const std::shared_ptr<GeomAPI_XY>& theOther) const
 {
   gp_XY aResult(theOther->x() - x(), theOther->y() - y());
   return aResult.Modulus();