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 the revolution algorithm revolving an edge between faces.
[modules/shaper.git]
/
src
/
Model
/
Model_Expression.cpp
diff --git
a/src/Model/Model_Expression.cpp
b/src/Model/Model_Expression.cpp
index 2696e6c2d75f0dc8ec7ea8e538c1403dcf58a8b6..934e910dd170968ac8c176123fe7a95dfe117c1b 100644
(file)
--- a/
src/Model/Model_Expression.cpp
+++ b/
src/Model/Model_Expression.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
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
@@
-12,14
+12,15
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "Model_Expression.h"
//
#include "Model_Expression.h"
+#include <Locale_Convert.h>
+
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
@@
-46,7
+47,7
@@
Model_Expression::Model_Expression(TDF_Label& theLabel)
}
}
}
}
-void Model_Expression::setText(const std::string& theValue)
+void Model_Expression::setText(const std::
w
string& theValue)
{
if (text() != theValue) {
myText->Set(TCollection_ExtendedString(theValue.c_str()));
{
if (text() != theValue) {
myText->Set(TCollection_ExtendedString(theValue.c_str()));
@@
-56,9
+57,9
@@
void Model_Expression::setText(const std::string& theValue)
setError(text().empty() ? "" : "Not a double value.");
}
setError(text().empty() ? "" : "Not a double value.");
}
-std::string Model_Expression::text() const
+std::
w
string Model_Expression::text() const
{
{
- return
TCollection_AsciiString(myText->Get()).ToCString(
);
+ return
Locale::Convert::toWString(myText->Get().ToExtString()
);
}
void Model_Expression::setError(const std::string& theError)
}
void Model_Expression::setError(const std::string& theError)
@@
-72,20
+73,20
@@
std::string Model_Expression::error()
return TCollection_AsciiString(myError->Get()).ToCString();
}
return TCollection_AsciiString(myError->Get()).ToCString();
}
-void Model_Expression::setUsedParameters(const std::set<std::string>& theUsedParameters)
+void Model_Expression::setUsedParameters(const std::set<std::
w
string>& theUsedParameters)
{
myUsedParameters->Clear();
{
myUsedParameters->Clear();
- std::set<std::string>::const_iterator anIt = theUsedParameters.begin();
+ std::set<std::
w
string>::const_iterator anIt = theUsedParameters.begin();
for (; anIt != theUsedParameters.end(); ++anIt)
myUsedParameters->Append(TCollection_ExtendedString(anIt->c_str()));
}
for (; anIt != theUsedParameters.end(); ++anIt)
myUsedParameters->Append(TCollection_ExtendedString(anIt->c_str()));
}
-std::set<std::string> Model_Expression::usedParameters() const
+std::set<std::
w
string> Model_Expression::usedParameters() const
{
{
- std::set<std::string> aResult;
+ std::set<std::
w
string> aResult;
TDataStd_ListIteratorOfListOfExtendedString aIt;
for (aIt.Initialize(myUsedParameters->List()); aIt.More(); aIt.Next())
TDataStd_ListIteratorOfListOfExtendedString aIt;
for (aIt.Initialize(myUsedParameters->List()); aIt.More(); aIt.Next())
- aResult.insert(
TCollection_AsciiString(aIt.Value()).ToCString(
));
+ aResult.insert(
Locale::Convert::toWString(aIt.Value().ToExtString()
));
return aResult;
}
return aResult;
}