OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 17:32:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1985 Curve Calculator : Simplify interface to expression parser

Browse Source
This commit is contained in:
Magne Sjaastad committed 2017-10-12 10:52:30 +02:00
1 parent 650e29d6d5
commit 445048c24b
5 files changed
+17 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ThirdParty/expressionparser/ExpressionParser.cpp
Vendored
+2 -18
View File
@@ -36,14 +36,6 @@ ExpressionParser::~ExpressionParser()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void ExpressionParser::setExpression(const QString& expression)
{
m_expressionParserImpl->setExpression(expression);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -63,15 +55,7 @@ void ExpressionParser::assignVector(const QString& variableName, std::vector<dou
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool ExpressionParser::evaluate()
bool ExpressionParser::evaluate(const QString& expressionText, QString* errorText)
{
return m_expressionParserImpl->evaluate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString ExpressionParser::errorText()
{
return m_expressionParserImpl->errorText();
return m_expressionParserImpl->evaluate(expressionText, errorText);
}