Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for issue #1000
[modules/shaper.git]
/
src
/
GeomAPI
/
GeomAPI_Pnt2d.h
diff --git
a/src/GeomAPI/GeomAPI_Pnt2d.h
b/src/GeomAPI/GeomAPI_Pnt2d.h
index a1faf626c561b1e5df015cb502575af70cbab1c4..d3b3426cdca61c9bbbc6436f6820681b2750c79a 100644
(file)
--- a/
src/GeomAPI/GeomAPI_Pnt2d.h
+++ b/
src/GeomAPI/GeomAPI_Pnt2d.h
@@
-1,43
+1,65
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: GeomAPI_Pnt2d.h
// Created: 29 May 2014
// Author: Artem ZHIDKOV
// File: GeomAPI_Pnt2d.h
// Created: 29 May 2014
// Author: Artem ZHIDKOV
-#ifndef GeomAPI_Pnt2d_H
eaderFile
-#define GeomAPI_Pnt2d_H
eaderFile
+#ifndef GeomAPI_Pnt2d_H
_
+#define GeomAPI_Pnt2d_H
_
#include <GeomAPI_Interface.h>
#include <GeomAPI_Interface.h>
-#include <
boost/shared_ptr.hpp
>
+#include <
memory
>
class GeomAPI_XY;
class GeomAPI_XY;
+class GeomAPI_Pnt;
+class GeomAPI_Dir;
/**\class GeomAPI_Pnt2d
* \ingroup DataModel
* \brief 2D point defined by two coordinates
*/
/**\class GeomAPI_Pnt2d
* \ingroup DataModel
* \brief 2D point defined by two coordinates
*/
-class G
EOMAPI_EXPORT GeomAPI_Pnt2d
: public GeomAPI_Interface
+class G
eomAPI_Pnt2d
: public GeomAPI_Interface
{
{
-public:
+
public:
/// Creation of point by coordinates
/// Creation of point by coordinates
+ GEOMAPI_EXPORT
GeomAPI_Pnt2d(const double theX, const double theY);
/// Creation of point by coordinates
GeomAPI_Pnt2d(const double theX, const double theY);
/// Creation of point by coordinates
- GeomAPI_Pnt2d(const boost::shared_ptr<GeomAPI_XY>& theCoords);
+ GEOMAPI_EXPORT
+ GeomAPI_Pnt2d(const std::shared_ptr<GeomAPI_XY>& theCoords);
/// returns X coordinate
/// returns X coordinate
+ GEOMAPI_EXPORT
double x() const;
/// returns Y coordinate
double x() const;
/// returns Y coordinate
+ GEOMAPI_EXPORT
double y() const;
/// sets X coordinate
double y() const;
/// sets X coordinate
+ GEOMAPI_EXPORT
void setX(const double theX);
/// sets Y coordinate
void setX(const double theX);
/// sets Y coordinate
+ GEOMAPI_EXPORT
void setY(const double theY);
void setY(const double theY);
+ /// Returns the 3D point
+ GEOMAPI_EXPORT
+ std::shared_ptr<GeomAPI_Pnt> to3D(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
+ const std::shared_ptr<GeomAPI_Dir>& theDirX,
+ const std::shared_ptr<GeomAPI_Dir>& theDirY);
+
/// returns coordinates of the point
/// returns coordinates of the point
- const boost::shared_ptr<GeomAPI_XY> xy();
+ GEOMAPI_EXPORT
+ const std::shared_ptr<GeomAPI_XY> xy();
/// Distance between two points
/// Distance between two points
- double distance(const boost::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
+ GEOMAPI_EXPORT
+ double distance(const std::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
+
+ /// Returns whether the distance between two points is less then precision confusion
+ GEOMAPI_EXPORT
+ bool isEqual(const std::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
};
#endif
};
#endif