aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring VFormula::Eval().

Browse Source 
Plus, in case of check If zero set value to Error instead of "0". This confuses
users.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-02-22 15:03:11 +02:00
parent 5f3ee65501
commit ced8963041
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/libs/vpatterndb/vformula.cpp
View File

@ -234,53 +234,35 @@ void VFormula::Eval()
{
return;
}
if (formula.isEmpty())
{
value = tr("Error");
_error = true;
dValue = 0;
}
else
qreal result = 0;
if (not formula.isEmpty())
{
try
{
QScopedPointer<Calculator> cal(new Calculator());
QString expression = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->GetOsSeparator());
const qreal result = cal->EvalFormula(data->DataVariables(), expression);
if (qIsInf(result) || qIsNaN(result))
{
value = tr("Error");
_error = true;
dValue = 0;
}
else
{
//if result equal 0
if (checkZero && qFuzzyIsNull(result))
{
value = QString("0");
_error = true;
dValue = 0;
}
else
{
dValue = result;
value = QString(qApp->LocaleToString(result) + " " + postfix);
_error = false;
}
}
const QString expression = qApp->TrVars()->FormulaFromUser(formula, qApp->Settings()->GetOsSeparator());
result = cal->EvalFormula(data->DataVariables(), expression);
}
catch (qmu::QmuParserError &e)
{
value = tr("Error");
_error = true;
dValue = 0;
qDebug() << "\nMath parser error:\n"
<< "--------------------------------------\n"
<< "Message: " << e.GetMsg() << "\n"
<< "Expression: " << e.GetExpr() << "\n"
<< "--------------------------------------";
return;
}
if (not qIsInf(result) && not qIsNaN(result) && not (checkZero && qFuzzyIsNull(result)))
{
dValue = result;
value = qApp->LocaleToString(result) + QLatin1Char(' ') + postfix;
_error = false;
}
}
}