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
Issue #1015: The validate icon must be greyed and inactive instead of red and active
[modules/shaper.git]
/
src
/
GeomAPI
/
GeomAPI_Dir.cpp
diff --git
a/src/GeomAPI/GeomAPI_Dir.cpp
b/src/GeomAPI/GeomAPI_Dir.cpp
index e3badb4401b41cdd0fc5a2f7f3bd3712ca172f08..6f57e76815be685afaf7de7fdd399aaceead0348 100644
(file)
--- a/
src/GeomAPI/GeomAPI_Dir.cpp
+++ b/
src/GeomAPI/GeomAPI_Dir.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: GeomAPI_Dir.cpp
// Created: 23 Apr 2014
// Author: Mikhail PONIKAROV
// File: GeomAPI_Dir.cpp
// Created: 23 Apr 2014
// Author: Mikhail PONIKAROV
@@
-7,15
+9,17
@@
#include <gp_Dir.hxx>
#include <gp_Dir.hxx>
-#define MY_DIR
static_cast<gp_Dir*>(myImpl
)
+#define MY_DIR
implPtr<gp_Dir>(
)
GeomAPI_Dir::GeomAPI_Dir(const double theX, const double theY, const double theZ)
GeomAPI_Dir::GeomAPI_Dir(const double theX, const double theY, const double theZ)
- : GeomAPI_Interface(new gp_Dir(theX, theY, theZ))
-{}
+ : GeomAPI_Interface(new gp_Dir(theX, theY, theZ))
+{
+}
-GeomAPI_Dir::GeomAPI_Dir(const boost::shared_ptr<GeomAPI_XYZ>& theCoords)
- : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z()))
-{}
+GeomAPI_Dir::GeomAPI_Dir(const std::shared_ptr<GeomAPI_XYZ>& theCoords)
+ : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z()))
+{
+}
double GeomAPI_Dir::x() const
{
double GeomAPI_Dir::x() const
{
@@
-32,19
+36,30
@@
double GeomAPI_Dir::z() const
return MY_DIR->Z();
}
return MY_DIR->Z();
}
-const
boost::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::xyz()
+const
std::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::xyz()
{
{
- return
boost
::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z()));
+ return
std
::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z()));
}
}
-double GeomAPI_Dir::dot(const boost::shared_ptr<GeomAPI_Dir>& theArg) const
+void GeomAPI_Dir::reverse()
+{
+ MY_DIR->Reverse();
+}
+
+double GeomAPI_Dir::dot(const std::shared_ptr<GeomAPI_Dir>& theArg) const
{
return MY_DIR->Dot(theArg->impl<gp_Dir>());
}
{
return MY_DIR->Dot(theArg->impl<gp_Dir>());
}
-const boost::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::cross(const boost::shared_ptr<GeomAPI_Dir>& theArg) const
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::cross(
+ const std::shared_ptr<GeomAPI_Dir>& theArg) const
{
gp_XYZ aResult = MY_DIR->XYZ().Crossed(theArg->impl<gp_Dir>().XYZ());
{
gp_XYZ aResult = MY_DIR->XYZ().Crossed(theArg->impl<gp_Dir>().XYZ());
- return boost::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z()));
+ return std::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z()));
+}
+
+double GeomAPI_Dir::angle(const std::shared_ptr<GeomAPI_Dir>& theArg) const
+{
+ return MY_DIR->Angle(theArg->impl<gp_Dir>());
}
}