Prepare version 1.2.1: quick fix for iteration 2 release

[modules/shaper.git] / src / Model / Model_AttributeDouble.cpp

diff --git a/src/Model/Model_AttributeDouble.cpp b/src/Model/Model_AttributeDouble.cpp
index 87bba89cfcb414356737172b932e57058adcf23c..0736eddc0570d7a4611121da979160655e65819f 100644 (file)
--- a/src/Model/Model_AttributeDouble.cpp
+++ b/src/Model/Model_AttributeDouble.cpp
@@ -7,9 +7,11 @@
 #include "Model_AttributeDouble.h"
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Events.h>
 
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
+#include <TDataStd_UAttribute.hxx>
 
 using namespace std;
 
@@ -33,6 +35,8 @@ Model_AttributeDouble::Model_AttributeDouble(TDF_Label& theLabel)
   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());
   }
 }
@@ -42,7 +46,10 @@ 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); ?
+    owner()->data()->sendAttributeUpdated(this);
+
+    // Send it to evaluator to convert into the double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
   }
 }
 
@@ -50,3 +57,19 @@ string Model_AttributeDouble::text()
 {
   return TCollection_AsciiString(myText->Get()).ToCString();
 }
+
+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);
+  }
+}
+
+bool Model_AttributeDouble::expressionInvalid()
+{
+  return myReal->Label().IsAttribute(kInvalidGUID) == Standard_True;
+}