-// 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"
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();
}
double Model_ExpressionDouble::value()
{
- if (myIsInitialized)
+ if (myIsInitialized && !myReal.IsNull())
return myReal->Get();
return std::numeric_limits<double>::max(); // error
}
int Model_ExpressionInteger::value()
{
- if (myIsInitialized)
+ if (myIsInitialized && !myInteger.IsNull())
return myInteger->Get();
return std::numeric_limits<int>::max(); // error
}