X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_XY.cpp;h=ccfd261725aa8c028ffd9f0670a0b79940f63632;hb=95ff1008bc8215fdeafd7d253dc5a6f33e949363;hp=94341c31e95029759b616798bea65b2040427469;hpb=8a9a3ae0793503abf21a2c1b0a08d47d85449fc4;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_XY.cpp b/src/GeomAPI/GeomAPI_XY.cpp
index 94341c31e..ccfd26172 100644
--- a/src/GeomAPI/GeomAPI_XY.cpp
+++ b/src/GeomAPI/GeomAPI_XY.cpp
@@ -1,16 +1,32 @@
-// File:        GeomAPI_XY.cpp
-// Created:     30 May 2014
-// Author:      Artem ZHIDKOV
+// Copyright (C) 2014-2021  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include<GeomAPI_XY.h>
 
 #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 +48,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();