X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Expression.cpp;h=3a1d62ab25642c774dab95588c636644c3a99d8d;hb=2f70266a7065a81d239198cf4ca0f507e46b96ff;hp=d87020b6420cb35a9f8b8f7cf4d8fe9326643ef1;hpb=1c4fdb35d274c6205676a78e58edc196c28e7c4f;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Expression.cpp b/src/Model/Model_Expression.cpp
index d87020b64..3a1d62ab2 100644
--- a/src/Model/Model_Expression.cpp
+++ b/src/Model/Model_Expression.cpp
@@ -14,63 +14,32 @@
 #include <TDataStd_RealArray.hxx>
 #include <TDataStd_ExtStringArray.hxx>
 
+#include <limits>
+
+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;
-  }
-  if (!theLabel.FindAttribute(TDataStd_Real::GetID(), myReal)) {
-    myReal = TDataStd_Real::Set(theLabel, 0.);
-    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());
-        }
-      }
-    }
-
   }
 }
 
-void Model_Expression::setValue(const double theValue)
-{
-  if (value() != theValue)
-    myReal->Set(theValue);
-}
-
-double Model_Expression::value()
-{
-  return myReal->Get();
-}
-
 void Model_Expression::setText(const std::string& 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 
@@ -78,22 +47,6 @@ std::string Model_Expression::text() const
   return TCollection_AsciiString(myText->Get()).ToCString();
 }
 
-static Standard_GUID kInvalidGUID("caee5ce4-34b1-4b29-abcb-685287d18096");
-
-void Model_Expression::setInvalid(const bool theFlag)
-{
-  if (theFlag) {
-    TDataStd_UAttribute::Set(myReal->Label(), kInvalidGUID);
-  } else {
-    myReal->Label().ForgetAttribute(kInvalidGUID);
-  }
-}
-
-bool Model_Expression::isInvalid()
-{
-  return myReal->Label().IsAttribute(kInvalidGUID) == Standard_True;
-}
-
 void Model_Expression::setError(const std::string& theError)
 {
   if (error() != theError)
@@ -121,3 +74,99 @@ std::set<std::string> Model_Expression::usedParameters() const
     aResult.insert(TCollection_AsciiString(aIt.Value()).ToCString());
   return aResult;
 }
+
+///////////////// Model_ExpressionDouble /////////////
+Model_ExpressionDouble::Model_ExpressionDouble(TDF_Label& theLabel)
+    : Model_Expression(theLabel)
+{
+  myLab = theLabel;
+  reinit();
+}
+
+void Model_ExpressionDouble::reinit()
+{
+  if (!myLab.FindAttribute(TDataStd_Real::GetID(), myReal)) {
+    myIsInitialized = false;
+  } else {
+    myIsInitialized = true;
+  }
+}
+
+void Model_ExpressionDouble::setValue(const double 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()
+{
+  if (myIsInitialized)
+    return myReal->Get();
+  return std::numeric_limits<double>::max(); // error
+}
+
+void Model_ExpressionDouble::setInvalid(const bool theFlag)
+{
+  if (theFlag) {
+    TDataStd_UAttribute::Set(myText->Label(), kInvalidGUID);
+  } else {
+    myText->Label().ForgetAttribute(kInvalidGUID);
+  }
+}
+
+bool Model_ExpressionDouble::isInvalid()
+{
+  return myText->Label().IsAttribute(kInvalidGUID) == Standard_True;
+}
+
+///////////////// Model_ExpressionInteger /////////////
+Model_ExpressionInteger::Model_ExpressionInteger(TDF_Label& theLabel)
+    : Model_Expression(theLabel)
+{
+  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 (!myIsInitialized || myInteger.IsNull()) {
+    myInteger = TDataStd_Integer::Set(myText->Label(), theValue);
+    myIsInitialized = true;
+  } else if (value() != theValue) {
+    myInteger->Set(theValue);
+  }
+}
+
+int Model_ExpressionInteger::value()
+{
+  if (myIsInitialized)
+    return myInteger->Get();
+  return std::numeric_limits<int>::max(); // error
+}
+
+void Model_ExpressionInteger::setInvalid(const bool theFlag)
+{
+  if (theFlag) {
+    TDataStd_UAttribute::Set(myText->Label(), kInvalidGUID);
+  } else {
+    myText->Label().ForgetAttribute(kInvalidGUID);
+  }
+}
+
+bool Model_ExpressionInteger::isInvalid()
+{
+  return myText->Label().IsAttribute(kInvalidGUID) == Standard_True;
+}