X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.cpp;h=d9e8ce69a50688d83d91ceb1b85b26666e28bced;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=3ef3e3c41c1510d217a9efdb6aed4621f4bc4b61;hpb=f3a0d516413a9cd48c40d6094339606ce00bb4db;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.cpp b/src/Model/Model_AttributeDouble.cpp
index 3ef3e3c41..d9e8ce69a 100644
--- a/src/Model/Model_AttributeDouble.cpp
+++ b/src/Model/Model_AttributeDouble.cpp
@@ -1,78 +1,108 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModelAPI_AttributeDouble.cxx
-// Created:     2 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2023  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_AttributeDouble.h"
-#include <ModelAPI_Feature.h>
+
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Events.h>
+#include <Model_Expression.h>
+#include <ModelAPI_Object.h>
 
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
-#include <TDataStd_UAttribute.hxx>
+Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
+{
+  TDF_Label anExpressionLab = theLabel.FindChild(1);
+  myExpression.reset(new Model_ExpressionDouble(anExpressionLab));
+  myIsInitialized = myExpression->isInitialized();
+}
 
-using namespace std;
+void Model_AttributeDouble::reinit()
+{
+  myExpression->reinit();
+  myIsInitialized = myExpression->isInitialized();
+}
 
-void Model_AttributeDouble::setValue(const double theValue)
+void Model_AttributeDouble::reset()
 {
-  if (!myIsInitialized || myReal->Get() != theValue) {
-    myReal->Set(theValue);
+  myExpression->reset();
+  myIsInitialized = false;
+}
+
+void Model_AttributeDouble::setCalculatedValue(const double theValue)
+{
+  if (!myIsInitialized || value() != theValue) {
+    myExpression->setValue(theValue);
     owner()->data()->sendAttributeUpdated(this);
   }
 }
 
-double Model_AttributeDouble::value()
+void Model_AttributeDouble::setValue(const double theValue)
 {
-  return myReal->Get();
+  setCalculatedValue(text().empty() ? theValue : value());
 }
 
-Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
+double Model_AttributeDouble::value()
 {
-  // check the attribute could be already presented in this doc (after load document)
-  myIsInitialized = theLabel.FindAttribute(TDataStd_Real::GetID(), myReal) == Standard_True;
-  if (!myIsInitialized) {
-    // create attribute: not initialized by value yet, just zero
-    myReal = TDataStd_Real::Set(theLabel, 0.);
-  }
-  if (!theLabel.FindAttribute(TDataStd_Name::GetID(), myText)) {
-    myText = TDataStd_Name::Set(theLabel, TCollection_ExtendedString());
-  }
+  return myExpression->value();
 }
 
-void Model_AttributeDouble::setText(const std::string& theValue)
+void Model_AttributeDouble::setText(const std::wstring& theValue)
 {
-  TCollection_ExtendedString aValue(theValue.c_str());
-  if (myText->Get() != aValue) {
-    myText->Set(aValue);
+  if (text() != theValue) {
+    myExpression->setText(theValue);
+    // Send it to evaluator to convert text to double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
     owner()->data()->sendAttributeUpdated(this);
-    // Send it to evaluator to convert into the double and store in the attribute
-    static Events_ID anId = ModelAPI_AttributeEvalMessage::eventId();
-    std::shared_ptr<ModelAPI_AttributeEvalMessage> aMessage =
-      std::shared_ptr<ModelAPI_AttributeEvalMessage>(new ModelAPI_AttributeEvalMessage(anId, this));
-    aMessage->setAttribute(owner()->data()->attribute(id())); // to get shared pointer to this
-    Events_Loop::loop()->send(aMessage);
   }
 }
 
-string Model_AttributeDouble::text()
+std::wstring Model_AttributeDouble::text()
 {
-  return TCollection_AsciiString(myText->Get()).ToCString();
+  return myExpression->text();
 }
 
-Standard_GUID kInvalidGUID("caee5ce4-34b1-4b29-abcb-685287d18096");
-
 void Model_AttributeDouble::setExpressionInvalid(const bool theFlag)
 {
-  if (theFlag) {
-    TDataStd_UAttribute::Set(myReal->Label(), kInvalidGUID);
-  } else {
-    myReal->Label().ForgetAttribute(kInvalidGUID);
-  }
+  myExpression->setInvalid(theFlag);
 }
 
 bool Model_AttributeDouble::expressionInvalid()
 {
-  return myReal->Label().IsAttribute(kInvalidGUID) == Standard_True;
+  return myExpression->isInvalid();
+}
+
+void Model_AttributeDouble::setExpressionError(const std::string& theError)
+{
+  if (expressionError() != theError)
+    myExpression->setError(theError);
+}
+
+std::string Model_AttributeDouble::expressionError()
+{
+  return myExpression->error();
+}
+
+void Model_AttributeDouble::setUsedParameters(const std::set<std::wstring>& theUsedParameters)
+{
+  myExpression->setUsedParameters(theUsedParameters);
+}
+
+std::set<std::wstring> Model_AttributeDouble::usedParameters() const
+{
+  return myExpression->usedParameters();
 }