X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.cpp;h=0a8566d119954485f051674eca21380c27045d1c;hb=4fc2dc9fdc0c14fab5f2780598eccdc1368d81b9;hp=4764420f7c515a0184b7471f416ae4a328e5bdaa;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.cpp b/src/Model/Model_AttributeDouble.cpp
index 4764420f7..0a8566d11 100644
--- a/src/Model/Model_AttributeDouble.cpp
+++ b/src/Model/Model_AttributeDouble.cpp
@@ -5,30 +5,77 @@
 // Author:      Mikhail PONIKAROV
 
 #include "Model_AttributeDouble.h"
-#include <ModelAPI_Feature.h>
+
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Events.h>
+#include <ModelAPI_Expression.h>
+#include <ModelAPI_Object.h>
 
-using namespace std;
+Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
+{
+  myIsInitialized = true;
+}
 
-void Model_AttributeDouble::setValue(const double theValue)
+void Model_AttributeDouble::setCalculatedValue(const double theValue)
 {
-  if (!myIsInitialized || myReal->Get() != theValue) {
-    myReal->Set(theValue);
+  if (!myIsInitialized || value() != theValue) {
+    myExpression->setValue(theValue);
     owner()->data()->sendAttributeUpdated(this);
   }
 }
 
+void Model_AttributeDouble::setValue(const double theValue)
+{
+  setCalculatedValue(text().empty() ? theValue : value());
+}
+
 double Model_AttributeDouble::value()
 {
-  return myReal->Get();
+  return myExpression->value();
 }
 
-Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
+void Model_AttributeDouble::setText(const std::string& theValue)
 {
-  // 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 (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);
   }
 }
+
+std::string Model_AttributeDouble::text()
+{
+  return myExpression->text();
+}
+
+void Model_AttributeDouble::setExpressionInvalid(const bool theFlag)
+{
+  myExpression->setInvalid(theFlag);
+}
+
+bool Model_AttributeDouble::expressionInvalid()
+{
+  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::string>& theUsedParameters)
+{
+  myExpression->setUsedParameters(theUsedParameters);
+}
+
+std::set<std::string> Model_AttributeDouble::usedParameters() const
+{
+  return myExpression->usedParameters();
+}