-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: Model_Expression.cpp
-// Created: 5 Aug 2015
-// Author: Sergey POKHODENKO
+// Copyright (C) 2014-2020 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include "Model_Expression.h"
+#include <Locale_Convert.h>
+
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
}
}
-void Model_Expression::setText(const std::string& theValue)
+void Model_Expression::setText(const std::wstring& theValue)
{
if (text() != theValue) {
myText->Set(TCollection_ExtendedString(theValue.c_str()));
setError(text().empty() ? "" : "Not a double value.");
}
-std::string Model_Expression::text() const
+std::wstring 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)
return TCollection_AsciiString(myError->Get()).ToCString();
}
-void Model_Expression::setUsedParameters(const std::set<std::string>& theUsedParameters)
+void Model_Expression::setUsedParameters(const std::set<std::wstring>& theUsedParameters)
{
myUsedParameters->Clear();
- std::set<std::string>::const_iterator anIt = theUsedParameters.begin();
+ std::set<std::wstring>::const_iterator anIt = theUsedParameters.begin();
for (; anIt != theUsedParameters.end(); ++anIt)
myUsedParameters->Append(TCollection_ExtendedString(anIt->c_str()));
}
-std::set<std::string> Model_Expression::usedParameters() const
+std::set<std::wstring> Model_Expression::usedParameters() const
{
- std::set<std::string> aResult;
+ std::set<std::wstring> aResult;
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;
}
+///////////////// Model_ExpressionDouble /////////////
Model_ExpressionDouble::Model_ExpressionDouble(TDF_Label& theLabel)
: Model_Expression(theLabel)
{
- if (!theLabel.FindAttribute(TDataStd_Real::GetID(), myReal)) {
+ myLab = theLabel;
+ reinit();
+}
+
+void Model_ExpressionDouble::reinit()
+{
+ if (!myLab.FindAttribute(TDataStd_Real::GetID(), myReal)) {
myIsInitialized = false;
- // MPV: temporarily to support the previously saved files (to check and resolve bugs), to be removed
- Handle(TDataStd_RealArray) anOldArray;
- if (theLabel.Father().FindAttribute(TDataStd_RealArray::GetID(), anOldArray) == Standard_True) {
- myReal = TDataStd_Real::Set(theLabel, 0.);
- myReal->Set(anOldArray->Value(theLabel.Tag() - 1));
- myIsInitialized = true;
- Handle(TDataStd_ExtStringArray) anOldExp;
- if (theLabel.Father().FindAttribute(TDataStd_ExtStringArray::GetID(), anOldExp) == Standard_True) {
- myText->Set(anOldExp->Value(theLabel.Tag() - 1));
- }
- } else {
- Handle(TDataStd_Real) anOldReal;
- if (theLabel.Father().FindAttribute(TDataStd_Real::GetID(), anOldReal)) {
- myIsInitialized = true;
- myReal = TDataStd_Real::Set(theLabel, 0.);
- myReal->Set(anOldReal->Get());
- Handle(TDataStd_Name) aText;
- if (theLabel.Father().FindAttribute(TDataStd_Name::GetID(), aText)) {
- myText->Set(aText->Get());
- }
- }
- }
- } else
+ } else {
myIsInitialized = true;
+ }
}
void Model_ExpressionDouble::setValue(const double theValue)
double Model_ExpressionDouble::value()
{
- if (myIsInitialized)
+ if (myIsInitialized && !myReal.IsNull())
return myReal->Get();
return std::numeric_limits<double>::max(); // error
}
return myText->Label().IsAttribute(kInvalidGUID) == Standard_True;
}
-
+///////////////// Model_ExpressionInteger /////////////
Model_ExpressionInteger::Model_ExpressionInteger(TDF_Label& theLabel)
: Model_Expression(theLabel)
{
- if (!theLabel.FindAttribute(TDataStd_Integer::GetID(), myInteger)) {
+ myLab = theLabel;
+ reinit();
+}
+
+void Model_ExpressionInteger::reinit()
+{
+ if (!myLab.FindAttribute(TDataStd_Integer::GetID(), myInteger)) {
myIsInitialized = false;
- } else
+ } else {
myIsInitialized = true;
+ }
}
void Model_ExpressionInteger::setValue(const int theValue)
int Model_ExpressionInteger::value()
{
- if (myIsInitialized)
+ if (myIsInitialized && !myInteger.IsNull())
return myInteger->Get();
return std::numeric_limits<int>::max(); // error
}
