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
updated copyright message
[modules/shaper.git]
/
src
/
GeomData
/
GeomData_Point.cpp
diff --git
a/src/GeomData/GeomData_Point.cpp
b/src/GeomData/GeomData_Point.cpp
index 02b516f20451514768736e84000bfb7d8b0f6973..5ddb96d9a526177ccf3aee157657314ee2cd6338 100644
(file)
--- a/
src/GeomData/GeomData_Point.cpp
+++ b/
src/GeomData/GeomData_Point.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-202
0
CEA/DEN, EDF R&D
+// Copyright (C) 2014-202
3
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-85,7
+85,7
@@
void GeomData_Point::setX(const double theX)
setCalculatedValue(theX, 0, 0);
} else if (x() != theX) {
myExpression[0]->setValue(theX);
setCalculatedValue(theX, 0, 0);
} else if (x() != theX) {
myExpression[0]->setValue(theX);
- myExpression[0]->setText(""); // uninitialize the text
+ myExpression[0]->setText(
L
""); // uninitialize the text
owner()->data()->sendAttributeUpdated(this);
}
}
owner()->data()->sendAttributeUpdated(this);
}
}
@@
-96,7
+96,7
@@
void GeomData_Point::setY(const double theY)
setCalculatedValue(0, theY, 0);
} else if (y() != theY) {
myExpression[1]->setValue(theY);
setCalculatedValue(0, theY, 0);
} else if (y() != theY) {
myExpression[1]->setValue(theY);
- myExpression[1]->setText(""); // uninitialize the text
+ myExpression[1]->setText(
L
""); // uninitialize the text
owner()->data()->sendAttributeUpdated(this);
}
}
owner()->data()->sendAttributeUpdated(this);
}
}
@@
-108,7
+108,7
@@
void GeomData_Point::setZ(const double theZ)
}
else if (z() != theZ) {
myExpression[2]->setValue(theZ);
}
else if (z() != theZ) {
myExpression[2]->setValue(theZ);
- myExpression[2]->setText(""); // uninitialize the text
+ myExpression[2]->setText(
L
""); // uninitialize the text
owner()->data()->sendAttributeUpdated(this);
}
}
owner()->data()->sendAttributeUpdated(this);
}
}
@@
-120,9
+120,9
@@
std::shared_ptr<GeomAPI_Pnt> GeomData_Point::pnt()
return aResult;
}
return aResult;
}
-void GeomData_Point::setText(const std::string& theX,
- const std::string& theY,
- const std::string& theZ)
+void GeomData_Point::setText(const std::
w
string& theX,
+ const std::
w
string& theY,
+ const std::
w
string& theZ)
{
if (!myIsInitialized || textX() != theX || textY() != theY || textZ() != theZ) {
myExpression[0]->setText(theX);
{
if (!myIsInitialized || textX() != theX || textY() != theY || textZ() != theZ) {
myExpression[0]->setText(theX);
@@
-134,10
+134,10
@@
void GeomData_Point::setText(const std::string& theX,
}
}
}
}
-void GeomData_Point::setTextX(const std::string& theX)
+void GeomData_Point::setTextX(const std::
w
string& theX)
{
if (!myIsInitialized) {
{
if (!myIsInitialized) {
- static const std::
string aDefaultText =
"0";
+ static const std::
wstring aDefaultText = L
"0";
setText(theX, aDefaultText, aDefaultText);
}
else if (textX() != theX) {
setText(theX, aDefaultText, aDefaultText);
}
else if (textX() != theX) {
@@
-148,10
+148,10
@@
void GeomData_Point::setTextX(const std::string& theX)
}
}
}
}
-void GeomData_Point::setTextY(const std::string& theY)
+void GeomData_Point::setTextY(const std::
w
string& theY)
{
if (!myIsInitialized) {
{
if (!myIsInitialized) {
- static const std::
string aDefaultText =
"0";
+ static const std::
wstring aDefaultText = L
"0";
setText(aDefaultText, theY, aDefaultText);
}
else if (textY() != theY) {
setText(aDefaultText, theY, aDefaultText);
}
else if (textY() != theY) {
@@
-162,10
+162,10
@@
void GeomData_Point::setTextY(const std::string& theY)
}
}
}
}
-void GeomData_Point::setTextZ(const std::string& theZ)
+void GeomData_Point::setTextZ(const std::
w
string& theZ)
{
if (!myIsInitialized) {
{
if (!myIsInitialized) {
- static const std::
string aDefaultText =
"0";
+ static const std::
wstring aDefaultText = L
"0";
setText(aDefaultText, aDefaultText, theZ);
}
else if (textZ() != theZ) {
setText(aDefaultText, aDefaultText, theZ);
}
else if (textZ() != theZ) {
@@
-176,15
+176,15
@@
void GeomData_Point::setTextZ(const std::string& theZ)
}
}
}
}
-std::string GeomData_Point::textX()
+std::
w
string GeomData_Point::textX()
{
return myExpression[0]->text();
}
{
return myExpression[0]->text();
}
-std::string GeomData_Point::textY()
+std::
w
string GeomData_Point::textY()
{
return myExpression[1]->text();
}
{
return myExpression[1]->text();
}
-std::string GeomData_Point::textZ()
+std::
w
string GeomData_Point::textZ()
{
return myExpression[2]->text();
}
{
return myExpression[2]->text();
}
@@
-216,13
+216,13
@@
std::string GeomData_Point::expressionError(int theComponent)
}
void GeomData_Point::setUsedParameters(int theComponent,
}
void GeomData_Point::setUsedParameters(int theComponent,
- const std::set<std::string>& theUsedParameters)
+ const std::set<std::
w
string>& theUsedParameters)
{
assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
myExpression[theComponent]->setUsedParameters(theUsedParameters);
}
{
assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
myExpression[theComponent]->setUsedParameters(theUsedParameters);
}
-std::set<std::string> GeomData_Point::usedParameters(int theComponent) const
+std::set<std::
w
string> GeomData_Point::usedParameters(int theComponent) const
{
assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
return myExpression[theComponent]->usedParameters();
{
assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
return myExpression[theComponent]->usedParameters();