X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.cpp;h=91cebf7363bb3e18b96c3841b973795deab2bbf1;hb=dc19b4c930a9c2cf5db509fc81586deab00e7417;hp=6128aa892674f49bb26b58b2e20c283df525aaaa;hpb=32f6c2d8959088d7083711d79ffb7bdc8426f4c7;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.cpp b/src/Model/Model_AttributeDouble.cpp
index 6128aa892..91cebf736 100644
--- a/src/Model/Model_AttributeDouble.cpp
+++ b/src/Model/Model_AttributeDouble.cpp
@@ -5,20 +5,21 @@
 // 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_Feature.h>
 
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
-#include <TDataStd_UAttribute.hxx>
-
-using namespace std;
+Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
+{
+  myIsInitialized = true;
+}
 
 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);
   }
 }
@@ -30,51 +31,51 @@ void Model_AttributeDouble::setValue(const double theValue)
 
 double Model_AttributeDouble::value()
 {
-  return myReal->Get();
-}
-
-Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
-{
-  // 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)
 {
-  TCollection_ExtendedString aValue(theValue.c_str());
-  if (myText->Get() != aValue) {
-    myText->Set(aValue);
-    owner()->data()->sendAttributeUpdated(this);
-
+  if (text() != theValue) {
+    myExpression->setText(theValue);
     // Send it to evaluator to convert into the double and store in the attribute
     ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
+    owner()->data()->sendAttributeUpdated(this);
   }
 }
 
-string Model_AttributeDouble::text()
+std::string 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::string>& theUsedParameters)
+{
+  myExpression->setUsedParameters(theUsedParameters);
+}
+
+std::set<std::string> Model_AttributeDouble::usedParameters() const
+{
+  return myExpression->usedParameters();
 }