Reusing SUIT libraries

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

diff --git a/src/GeomAPI/GeomAPI_Circ2d.cpp b/src/GeomAPI/GeomAPI_Circ2d.cpp
index 4985ae3f4d9ddb629a1eb16271965cda6f923aab..78c26d69f12049724139dcf49f75b2f26cedbe5d 100644 (file)
--- a/src/GeomAPI/GeomAPI_Circ2d.cpp
+++ b/src/GeomAPI/GeomAPI_Circ2d.cpp
@@ -4,6 +4,7 @@
 
 #include <GeomAPI_Circ2d.h>
 #include <GeomAPI_Pnt2d.h>
+#include <GeomAPI_Dir2d.h>
 
 #include <gp_Dir2d.hxx>
 #include <gp_Circ2d.hxx>
@@ -17,6 +18,13 @@
 
 #define MY_CIRC2D static_cast<gp_Circ2d*>(myImpl)
 
+static gp_Circ2d* newCirc2d(const double theCenterX, const double theCenterY,
+                            const gp_Dir2d theDir, const double theRadius)
+{
+  gp_Pnt2d aCenter(theCenterX, theCenterY);
+  return new gp_Circ2d(gp_Ax2d(aCenter, theDir), theRadius);
+}
+
 static gp_Circ2d* newCirc2d(const double theCenterX, const double theCenterY,
                             const double thePointX,   const double thePointY)
 {
@@ -29,16 +37,25 @@ static gp_Circ2d* newCirc2d(const double theCenterX, const double theCenterY,
       return NULL;
 
   gp_Dir2d aDir(theCenterX - thePointX, theCenterY - thePointY);
-  return new gp_Circ2d(gp_Ax2d(aCenter, aDir), aRadius);
+  
+  return newCirc2d(theCenterX, theCenterY, aDir, aRadius);
 }
 
-
 GeomAPI_Circ2d::GeomAPI_Circ2d(const boost::shared_ptr<GeomAPI_Pnt2d>& theCenter,
                                const boost::shared_ptr<GeomAPI_Pnt2d>& theCirclePoint)
   : GeomAPI_Interface(newCirc2d(theCenter->x(), theCenter->y(),
                                 theCirclePoint->x(),   theCirclePoint->y()))
 {}
 
+GeomAPI_Circ2d::GeomAPI_Circ2d(const boost::shared_ptr<GeomAPI_Pnt2d>& theCenter,
+                               const boost::shared_ptr<GeomAPI_Dir2d>& theDir,
+                               double theRadius)
+ : GeomAPI_Interface(newCirc2d(theCenter->x(), theCenter->y(),
+                               theDir->impl<gp_Dir2d>(), theRadius))
+{
+
+}
+
 const boost::shared_ptr<GeomAPI_Pnt2d> GeomAPI_Circ2d::project(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint) const
 {
   boost::shared_ptr<GeomAPI_Pnt2d> aResult;
@@ -68,3 +85,14 @@ const boost::shared_ptr<GeomAPI_Pnt2d> GeomAPI_Circ2d::project(const boost::shar
   return aResult;
 }
 
+const boost::shared_ptr<GeomAPI_Pnt2d> GeomAPI_Circ2d::center() const
+{
+  const gp_Pnt2d& aCenter = MY_CIRC2D->Location();
+  return boost::shared_ptr<GeomAPI_Pnt2d>(new GeomAPI_Pnt2d(aCenter.X(), aCenter.Y()));
+}
+
+double GeomAPI_Circ2d::radius() const
+{
+  return MY_CIRC2D->Radius();
+}
+