OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#7316 Curve Calculator: Add support for single line if-statement

Browse Source
This commit is contained in:
Magne Sjaastad
2021-02-01 18:38:52 +01:00
parent 1a8f36373c
commit a060ba349e
6 changed files with 158 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ThirdParty/expressionparser/ExpressionParser.cpp vendored
View File

@@ -59,3 +59,21 @@ bool ExpressionParser::evaluate(const QString& expressionText, QString* errorTex
{
return m_expressionParserImpl->evaluate(expressionText, errorText);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool ExpressionParser::expandIfStatementsAndEvaluate(const QString& expressionText, QString* errorText /*= nullptr*/)
{
if (expressionText.contains("if"))
{
QString expandedExpressionText = ExpressionParserImpl::expandIfStatements(expressionText);
return m_expressionParserImpl->evaluate(expandedExpressionText, errorText);
}
else
{
return m_expressionParserImpl->evaluate(expressionText, errorText);
}
}