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 stable processing of mirror constraint (eliminating SolveSpace problems)
[modules/shaper.git]
/
src
/
GeomAPI
/
GeomAPI_XYZ.cpp
diff --git
a/src/GeomAPI/GeomAPI_XYZ.cpp
b/src/GeomAPI/GeomAPI_XYZ.cpp
index 37ba3aa9faa60d8d44e7237fcb3881dce33a17a8..1b8e0e457f068914f6b433274b42025d7e06844e 100644
(file)
--- a/
src/GeomAPI/GeomAPI_XYZ.cpp
+++ b/
src/GeomAPI/GeomAPI_XYZ.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: GeomAPI_XYZ.cpp
// Created: 23 Apr 2014
// Author: Mikhail PONIKAROV
// File: GeomAPI_XYZ.cpp
// Created: 23 Apr 2014
// Author: Mikhail PONIKAROV
@@
-43,42
+45,42
@@
void GeomAPI_XYZ::setZ(const double theZ)
return MY_XYZ->SetZ(theZ);
}
return MY_XYZ->SetZ(theZ);
}
-const
boost
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::added(
- const
boost
::shared_ptr<GeomAPI_XYZ>& theArg)
+const
std
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::added(
+ const
std
::shared_ptr<GeomAPI_XYZ>& theArg)
{
{
-
boost
::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() + theArg->x(),
+
std
::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() + theArg->x(),
MY_XYZ->Y() + theArg->y(), MY_XYZ->Z() + theArg->z()));
return aResult;
}
MY_XYZ->Y() + theArg->y(), MY_XYZ->Z() + theArg->z()));
return aResult;
}
-const
boost
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::decreased(
- const
boost
::shared_ptr<GeomAPI_XYZ>& theArg)
+const
std
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::decreased(
+ const
std
::shared_ptr<GeomAPI_XYZ>& theArg)
{
{
-
boost
::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() - theArg->x(),
+
std
::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() - theArg->x(),
MY_XYZ->Y() - theArg->y(), MY_XYZ->Z() - theArg->z()));
return aResult;
}
MY_XYZ->Y() - theArg->y(), MY_XYZ->Z() - theArg->z()));
return aResult;
}
-const
boost
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::multiplied(const double theArg)
+const
std
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::multiplied(const double theArg)
{
{
-
boost
::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() * theArg,
+
std
::shared_ptr<GeomAPI_XYZ> aResult(new GeomAPI_XYZ(MY_XYZ->X() * theArg,
MY_XYZ->Y() * theArg, MY_XYZ->Z() * theArg));
return aResult;
}
MY_XYZ->Y() * theArg, MY_XYZ->Z() * theArg));
return aResult;
}
-double GeomAPI_XYZ::dot(const
boost
::shared_ptr<GeomAPI_XYZ>& theArg) const
+double GeomAPI_XYZ::dot(const
std
::shared_ptr<GeomAPI_XYZ>& theArg) const
{
return MY_XYZ->Dot(theArg->impl<gp_XYZ>());
}
{
return MY_XYZ->Dot(theArg->impl<gp_XYZ>());
}
-const
boost
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::cross(
- const
boost
::shared_ptr<GeomAPI_XYZ>& theArg) const
+const
std
::shared_ptr<GeomAPI_XYZ> GeomAPI_XYZ::cross(
+ const
std
::shared_ptr<GeomAPI_XYZ>& theArg) const
{
gp_XYZ aResult = MY_XYZ->Crossed(theArg->impl<gp_XYZ>());
{
gp_XYZ aResult = MY_XYZ->Crossed(theArg->impl<gp_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_XYZ::distance(const
boost
::shared_ptr<GeomAPI_XYZ>& theOther) const
+double GeomAPI_XYZ::distance(const
std
::shared_ptr<GeomAPI_XYZ>& theOther) const
{
gp_XYZ aResult(theOther->x() - x(), theOther->y() - y(), theOther->z() - z());
return aResult.Modulus();
{
gp_XYZ aResult(theOther->x() - x(), theOther->y() - y(), theOther->z() - z());
return aResult.Modulus();