X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_Expression.cpp;h=934e910dd170968ac8c176123fe7a95dfe117c1b;hb=362b45a781c3209b8363570fe9fee316dfc1928e;hp=1cd6501014edb81131e4bdf32e939248ed2c61af;hpb=8bb6d0093e663565a2144ca82f082effa766b12b;p=modules%2Fshaper.git diff --git a/src/Model/Model_Expression.cpp b/src/Model/Model_Expression.cpp index 1cd650101..934e910dd 100644 --- a/src/Model/Model_Expression.cpp +++ b/src/Model/Model_Expression.cpp @@ -1,11 +1,26 @@ -// 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 + #include #include #include @@ -14,6 +29,7 @@ #include #include +#include static Standard_GUID kInvalidGUID("caee5ce4-34b1-4b29-abcb-685287d18096"); @@ -31,17 +47,19 @@ Model_Expression::Model_Expression(TDF_Label& theLabel) } } -void Model_Expression::setText(const std::string& theValue) +void Model_Expression::setText(const std::wstring& theValue) { - if (text() != theValue) + if (text() != theValue) { myText->Set(TCollection_ExtendedString(theValue.c_str())); + myIsInitialized = true; // the value will be set very soon + } 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) @@ -55,57 +73,43 @@ std::string Model_Expression::error() return TCollection_AsciiString(myError->Get()).ToCString(); } -void Model_Expression::setUsedParameters(const std::set& theUsedParameters) +void Model_Expression::setUsedParameters(const std::set& theUsedParameters) { myUsedParameters->Clear(); - std::set::const_iterator anIt = theUsedParameters.begin(); + std::set::const_iterator anIt = theUsedParameters.begin(); for (; anIt != theUsedParameters.end(); ++anIt) myUsedParameters->Append(TCollection_ExtendedString(anIt->c_str())); } -std::set Model_Expression::usedParameters() const +std::set Model_Expression::usedParameters() const { - std::set aResult; + std::set 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) { - if (!myIsInitialized) { + if (!myIsInitialized || myReal.IsNull()) { myReal = TDataStd_Real::Set(myText->Label(), theValue); myIsInitialized = true; } else if (value() != theValue) { @@ -115,9 +119,9 @@ void Model_ExpressionDouble::setValue(const double theValue) double Model_ExpressionDouble::value() { - if (myIsInitialized) + if (myIsInitialized && !myReal.IsNull()) return myReal->Get(); - return -1.; // error + return std::numeric_limits::max(); // error } void Model_ExpressionDouble::setInvalid(const bool theFlag) @@ -134,19 +138,26 @@ bool Model_ExpressionDouble::isInvalid() 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) { - if (!myIsInitialized) { + if (!myIsInitialized || myInteger.IsNull()) { myInteger = TDataStd_Integer::Set(myText->Label(), theValue); myIsInitialized = true; } else if (value() != theValue) { @@ -156,9 +167,9 @@ void Model_ExpressionInteger::setValue(const int theValue) int Model_ExpressionInteger::value() { - if (myIsInitialized) + if (myIsInitialized && !myInteger.IsNull()) return myInteger->Get(); - return -1; // error + return std::numeric_limits::max(); // error } void Model_ExpressionInteger::setInvalid(const bool theFlag)