X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Expression.cpp;h=934e910dd170968ac8c176123fe7a95dfe117c1b;hb=362b45a781c3209b8363570fe9fee316dfc1928e;hp=ef7408e36f335d3f30a6d9782977442b71f090c7;hpb=70f8434967195327040485995ca62b40d029e7ab;p=modules%2Fshaper.git diff --git a/src/Model/Model_Expression.cpp b/src/Model/Model_Expression.cpp index ef7408e36..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,42 +29,37 @@ #include #include +#include static Standard_GUID kInvalidGUID("caee5ce4-34b1-4b29-abcb-685287d18096"); Model_Expression::Model_Expression(TDF_Label& theLabel) { - myIsInitialized = true; if (!theLabel.FindAttribute(TDataStd_Name::GetID(), myText)) { myText = TDataStd_Name::Set(theLabel, TCollection_ExtendedString()); -// myIsInitialized = false; } if (!theLabel.FindAttribute(TDataStd_Comment::GetID(), myError)) { myError = TDataStd_Comment::Set(theLabel, TCollection_ExtendedString()); -// myIsInitialized = false; } if (!theLabel.FindAttribute(TDataStd_ExtStringList::GetID(), myUsedParameters)) { myUsedParameters = TDataStd_ExtStringList::Set(theLabel); -// myIsInitialized = false; } - // All this attributes should not set myIsInitialized = false. - // This attributes are optional and may absent in old files. So this is OK. - // The reason to set myIsInitialized = false is only absence of - // the value attribute. } -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) @@ -63,108 +73,115 @@ 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)) { - myReal = TDataStd_Real::Set(theLabel, 0.); + 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->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->Set(anOldReal->Get()); - Handle(TDataStd_Name) aText; - if (theLabel.Father().FindAttribute(TDataStd_Name::GetID(), aText)) { - myText->Set(aText->Get()); - } - } - } + } else { + myIsInitialized = true; } } void Model_ExpressionDouble::setValue(const double theValue) { - if (value() != theValue) + if (!myIsInitialized || myReal.IsNull()) { + myReal = TDataStd_Real::Set(myText->Label(), theValue); + myIsInitialized = true; + } else if (value() != theValue) { myReal->Set(theValue); + } } double Model_ExpressionDouble::value() { - return myReal->Get(); + if (myIsInitialized && !myReal.IsNull()) + return myReal->Get(); + return std::numeric_limits::max(); // error } void Model_ExpressionDouble::setInvalid(const bool theFlag) { if (theFlag) { - TDataStd_UAttribute::Set(myReal->Label(), kInvalidGUID); + TDataStd_UAttribute::Set(myText->Label(), kInvalidGUID); } else { - myReal->Label().ForgetAttribute(kInvalidGUID); + myText->Label().ForgetAttribute(kInvalidGUID); } } bool Model_ExpressionDouble::isInvalid() { - return myReal->Label().IsAttribute(kInvalidGUID) == Standard_True; + 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)) { - myInteger = TDataStd_Integer::Set(theLabel, 0); + myLab = theLabel; + reinit(); +} + +void Model_ExpressionInteger::reinit() +{ + if (!myLab.FindAttribute(TDataStd_Integer::GetID(), myInteger)) { myIsInitialized = false; + } else { + myIsInitialized = true; } } void Model_ExpressionInteger::setValue(const int theValue) { - if (value() != theValue) + if (!myIsInitialized || myInteger.IsNull()) { + myInteger = TDataStd_Integer::Set(myText->Label(), theValue); + myIsInitialized = true; + } else if (value() != theValue) { myInteger->Set(theValue); + } } int Model_ExpressionInteger::value() { - return myInteger->Get(); + if (myIsInitialized && !myInteger.IsNull()) + return myInteger->Get(); + return std::numeric_limits::max(); // error } void Model_ExpressionInteger::setInvalid(const bool theFlag) { if (theFlag) { - TDataStd_UAttribute::Set(myInteger->Label(), kInvalidGUID); + TDataStd_UAttribute::Set(myText->Label(), kInvalidGUID); } else { - myInteger->Label().ForgetAttribute(kInvalidGUID); + myText->Label().ForgetAttribute(kInvalidGUID); } } bool Model_ExpressionInteger::isInvalid() { - return myInteger->Label().IsAttribute(kInvalidGUID) == Standard_True; + return myText->Label().IsAttribute(kInvalidGUID) == Standard_True; }