X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_Expression.cpp;h=2696e6c2d75f0dc8ec7ea8e538c1403dcf58a8b6;hb=f6bd0f4e080b833c0de7ef25822ebee641073445;hp=1624e8d02ddc21250a80bfb5093dcab14f9e570a;hpb=a4bd17354dd1dc64335be9fba58dd54d07ae697a;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Expression.cpp b/src/Model/Model_Expression.cpp
index 1624e8d02..2696e6c2d 100644
--- a/src/Model/Model_Expression.cpp
+++ b/src/Model/Model_Expression.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_Expression.cpp
-// Created:     5 Aug 2015
-// Author:      Sergey POKHODENKO
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "Model_Expression.h"
 
@@ -34,13 +48,15 @@ Model_Expression::Model_Expression(TDF_Label& theLabel)
 
 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 
+std::string Model_Expression::text() const
 {
   return TCollection_AsciiString(myText->Get()).ToCString();
 }
@@ -73,40 +89,26 @@ std::set<std::string> Model_Expression::usedParameters() const
   return aResult;
 }
 
+///////////////// Model_ExpressionDouble /////////////
 Model_ExpressionDouble::Model_ExpressionDouble(TDF_Label& theLabel)
     : Model_Expression(theLabel)
 {
-  if (!theLabel.FindAttribute(TDataStd_Real::GetID(), myReal)) {
+  myLab = theLabel;
+  reinit();
+}
+
+void Model_ExpressionDouble::reinit()
+{
+  if (!myLab.FindAttribute(TDataStd_Real::GetID(), myReal)) {
     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 = TDataStd_Real::Set(theLabel, 0.);
-      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 = TDataStd_Real::Set(theLabel, 0.);
-        myReal->Set(anOldReal->Get());
-        Handle(TDataStd_Name) aText;
-        if (theLabel.Father().FindAttribute(TDataStd_Name::GetID(), aText)) {
-          myText->Set(aText->Get());
-        }
-      }
-    }
-  } else
+  } else {
     myIsInitialized = true;
+  }
 }
 
 void Model_ExpressionDouble::setValue(const double theValue)
 {
-  if (!myIsInitialized) {
+  if (!myIsInitialized || myReal.IsNull()) {
     myReal = TDataStd_Real::Set(myText->Label(), theValue);
     myIsInitialized = true;
   } else if (value() != theValue) {
@@ -116,7 +118,7 @@ void Model_ExpressionDouble::setValue(const double theValue)
 
 double Model_ExpressionDouble::value()
 {
-  if (myIsInitialized)
+  if (myIsInitialized && !myReal.IsNull())
     return myReal->Get();
   return std::numeric_limits<double>::max(); // error
 }
@@ -135,19 +137,26 @@ bool Model_ExpressionDouble::isInvalid()
   return myText->Label().IsAttribute(kInvalidGUID) == Standard_True;
 }
 
-
+///////////////// Model_ExpressionInteger /////////////
 Model_ExpressionInteger::Model_ExpressionInteger(TDF_Label& theLabel)
     : Model_Expression(theLabel)
 {
-  if (!theLabel.FindAttribute(TDataStd_Integer::GetID(), myInteger)) {
+  myLab = theLabel;
+  reinit();
+}
+
+void Model_ExpressionInteger::reinit()
+{
+  if (!myLab.FindAttribute(TDataStd_Integer::GetID(), myInteger)) {
     myIsInitialized = false;
-  } else
+  } else {
     myIsInitialized = true;
+  }
 }
 
 void Model_ExpressionInteger::setValue(const int theValue)
 {
-  if (!myIsInitialized) {
+  if (!myIsInitialized || myInteger.IsNull()) {
     myInteger = TDataStd_Integer::Set(myText->Label(), theValue);
     myIsInitialized = true;
   } else if (value() != theValue) {
@@ -157,7 +166,7 @@ void Model_ExpressionInteger::setValue(const int theValue)
 
 int Model_ExpressionInteger::value()
 {
-  if (myIsInitialized)
+  if (myIsInitialized && !myInteger.IsNull())
     return myInteger->Get();
   return std::numeric_limits<int>::max(); // error
 }