Adaptation to new data structure

[modules/shaper.git] / src / GeomAPI / GeomAPI_Pnt2d.cpp

diff --git a/src/GeomAPI/GeomAPI_Pnt2d.cpp b/src/GeomAPI/GeomAPI_Pnt2d.cpp
index f1cbb8e22d4d7c7b8a36f78a5822831dc8973496..e1cdf3d283e53b2627bee83afb0681b542f28b1a 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt2d.cpp
+++ b/src/GeomAPI/GeomAPI_Pnt2d.cpp
@@ -3,7 +3,10 @@
 // Author:      Artem ZHIDKOV
 
 #include<GeomAPI_Pnt2d.h>
+#include<GeomAPI_XY.h>
 #include<GeomAPI_XYZ.h>
+#include<GeomAPI_Pnt.h>
+#include<GeomAPI_Dir.h>
 
 #include<gp_Pnt2d.hxx>
 
@@ -13,6 +16,10 @@ GeomAPI_Pnt2d::GeomAPI_Pnt2d(const double theX, const double theY)
   : GeomAPI_Interface(new gp_Pnt2d(theX, theY))
 {}
 
+GeomAPI_Pnt2d::GeomAPI_Pnt2d(const boost::shared_ptr<GeomAPI_XY>& theCoords)
+  : GeomAPI_Interface(new gp_Pnt2d(theCoords->x(), theCoords->y()))
+{}
+
 double GeomAPI_Pnt2d::x() const
 {
   return MY_PNT2D->X();
@@ -33,6 +40,21 @@ void GeomAPI_Pnt2d::setY(const double theY)
   return MY_PNT2D->SetY(theY);
 }
 
+boost::shared_ptr<GeomAPI_Pnt> GeomAPI_Pnt2d::to3D(const boost::shared_ptr<GeomAPI_Pnt>& theOrigin,
+                                                   const boost::shared_ptr<GeomAPI_Dir>& theDirX,
+                                                   const boost::shared_ptr<GeomAPI_Dir>& theDirY)
+{
+  boost::shared_ptr<GeomAPI_XYZ> aSum = theOrigin->xyz()->added(
+    theDirX->xyz()->multiplied(x()))->added(theDirY->xyz()->multiplied(y()));
+
+  return boost::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aSum));
+}
+
+const boost::shared_ptr<GeomAPI_XY> GeomAPI_Pnt2d::xy()
+{
+  return boost::shared_ptr<GeomAPI_XY>(new GeomAPI_XY(MY_PNT2D->X(), MY_PNT2D->Y()));
+}
+
 double GeomAPI_Pnt2d::distance(const boost::shared_ptr<GeomAPI_Pnt2d>& theOther) const
 {
   return MY_PNT2D->Distance(theOther->impl<gp_Pnt2d>());