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 compilation errors (part 2)
[modules/shaper.git]
/
src
/
GeomData
/
GeomData_Dir.cpp
diff --git
a/src/GeomData/GeomData_Dir.cpp
b/src/GeomData/GeomData_Dir.cpp
index d36e8a8f5c84685b7b3d6fbc879ee6aa03ca2fa2..b1378d1710ac1a5839ffe32fc38dc45567151dcd 100644
(file)
--- a/
src/GeomData/GeomData_Dir.cpp
+++ b/
src/GeomData/GeomData_Dir.cpp
@@
-5,13
+5,12
@@
// Author: Mikhail PONIKAROV
#include "GeomData_Dir.h"
// Author: Mikhail PONIKAROV
#include "GeomData_Dir.h"
-#include "GeomAPI_Dir.h"
+#include <GeomAPI_Dir.h>
+#include <GeomAPI_XYZ.h>
#include <gp_Dir.hxx>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#include <gp_Dir.hxx>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
-using namespace std;
-
void GeomData_Dir::setValue(const double theX, const double theY, const double theZ)
{
if (!myIsInitialized || myCoords->Value(0) != theX || myCoords->Value(1) != theY
void GeomData_Dir::setValue(const double theX, const double theY, const double theZ)
{
if (!myIsInitialized || myCoords->Value(0) != theX || myCoords->Value(1) != theY
@@
-49,11
+48,23
@@
std::shared_ptr<GeomAPI_Dir> GeomData_Dir::dir()
new GeomAPI_Dir(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
}
new GeomAPI_Dir(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
}
+std::shared_ptr<GeomAPI_XYZ> GeomData_Dir::xyz()
+{
+ return std::shared_ptr<GeomAPI_XYZ>(
+ new GeomAPI_XYZ(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
+}
+
GeomData_Dir::GeomData_Dir(TDF_Label& theLabel)
{
GeomData_Dir::GeomData_Dir(TDF_Label& theLabel)
{
- myIsInitialized = theLabel.FindAttribute(TDataStd_RealArray::GetID(), myCoords) == Standard_True;
+ myLab = theLabel;
+ reinit();
+}
+
+void GeomData_Dir::reinit()
+{
+ myIsInitialized = myLab.FindAttribute(TDataStd_RealArray::GetID(), myCoords) == Standard_True;
if (!myIsInitialized) {
// create attribute: not initialized by value yet, just zero
if (!myIsInitialized) {
// create attribute: not initialized by value yet, just zero
- myCoords = TDataStd_RealArray::Set(
theLabel
, 0, 2);
+ myCoords = TDataStd_RealArray::Set(
myLab
, 0, 2);
}
}
}
}