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

diff --git a/src/Model/Model_Expression.cpp b/src/Model/Model_Expression.cpp
index 3a1d62ab2..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"
 
@@ -42,7 +56,7 @@ void Model_Expression::setText(const std::string& theValue)
   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();
 }
@@ -104,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
 }
@@ -152,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
 }