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

Handle case when NaN and Inf value treats like valid.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-05-24 15:06:35 +03:00
parent 66cc34ed64
commit 83243e5af3
9 changed files with 144 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/tape/tmainwindow.cpp
View File

@ -50,6 +50,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QComboBox> #include <QComboBox>
#include <QProcess> #include <QProcess>
#include <QtNumeric>
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
#include <QMimeData> #include <QMimeData>
@ -2421,9 +2422,18 @@ bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer
} }
f.replace("\n", " "); f.replace("\n", " ");
Calculator *cal = new Calculator(); Calculator *cal = new Calculator();
const qreal result = UnitConvertor(cal->EvalFormula(data->PlainVariables(), f), mUnit, pUnit); qreal result = cal->EvalFormula(data->PlainVariables(), f);
delete cal; delete cal;
if (qIsInf(result) || qIsNaN(result))
{
label->setText(tr("Error") + " (" + postfix + ").");
label->setToolTip(tr("Invalid value"));
return false;
}
result = UnitConvertor(result, mUnit, pUnit);
label->setText(qApp->LocaleToString(result) + " " +postfix); label->setText(qApp->LocaleToString(result) + " " +postfix);
label->setToolTip(tr("Value")); label->setToolTip(tr("Value"));
return true; return true;

8
src/app/valentina/dialogs/dialogincrements.cpp
View File

@ -42,6 +42,7 @@
#include <QTableWidget> #include <QTableWidget>
#include <QSettings> #include <QSettings>
#include <QTableWidgetItem> #include <QTableWidgetItem>
#include <QtNumeric>
#define DIALOG_MAX_FORMULA_HEIGHT 64 #define DIALOG_MAX_FORMULA_HEIGHT 64
@ -313,6 +314,13 @@ bool DialogIncrements::EvalIncrementFormula(const QString &formula, bool fromUse
const qreal result = cal->EvalFormula(data->PlainVariables(), f); const qreal result = cal->EvalFormula(data->PlainVariables(), f);
delete cal; delete cal;
if (qIsInf(result) || qIsNaN(result))
{
label->setText(tr("Error") + " (" + postfix + ").");
label->setToolTip(tr("Invalid value"));
return false;
}
label->setText(qApp->LocaleToString(result) + " " + postfix); label->setText(qApp->LocaleToString(result) + " " + postfix);
label->setToolTip(tr("Value")); label->setToolTip(tr("Value"));
return true; return true;

3
src/app/valentina/xml/vpattern.cpp
View File

@ -51,6 +51,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QUndoStack> #include <QUndoStack>
#include <QtCore/qmath.h> #include <QtCore/qmath.h>
#include <QtNumeric>
const QString VPattern::AttrReadOnly = QStringLiteral("readOnly"); const QString VPattern::AttrReadOnly = QStringLiteral("readOnly");
@ -2458,7 +2459,7 @@ qreal VPattern::EvalFormula(VContainer *data, const QString &formula, bool *ok)
const qreal result = cal->EvalFormula(data->PlainVariables(), f); const qreal result = cal->EvalFormula(data->PlainVariables(), f);
delete cal; delete cal;
*ok = true; (qIsInf(result) || qIsNaN(result)) ? *ok = false : *ok = true;
return result; return result;
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)

3
src/libs/vformat/vmeasurements.cpp
View File

@ -34,6 +34,7 @@
#include "../qmuparser/qmutokenparser.h" #include "../qmuparser/qmutokenparser.h"
#include <QDate> #include <QDate>
#include <QtNumeric>
const QString VMeasurements::TagVST = QStringLiteral("vst"); const QString VMeasurements::TagVST = QStringLiteral("vst");
const QString VMeasurements::TagVIT = QStringLiteral("vit"); const QString VMeasurements::TagVIT = QStringLiteral("vit");
@ -882,7 +883,7 @@ qreal VMeasurements::EvalFormula(VContainer *data, const QString &formula, bool
const qreal result = cal->EvalFormula(data->PlainVariables(), f); const qreal result = cal->EvalFormula(data->PlainVariables(), f);
delete cal; delete cal;
*ok = true; (qIsInf(result) || qIsNaN(result)) ? *ok = false : *ok = true;
return result; return result;
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)

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

@ -32,7 +32,9 @@
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vmisc/vsettings.h" #include "../vmisc/vsettings.h"
#include "vtranslatevars.h" #include "vtranslatevars.h"
#include <QDebug> #include <QDebug>
#include <QtNumeric>
//VFormula //VFormula
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -237,18 +239,27 @@ void VFormula::Eval()
const qreal result = cal->EvalFormula(data->PlainVariables(), expression); const qreal result = cal->EvalFormula(data->PlainVariables(), expression);
delete cal; delete cal;
//if result equal 0 if (qIsInf(result) || qIsNaN(result))
if (checkZero && qFuzzyIsNull(result))
{ {
value = QString("0"); value = QString(tr("Error"));
_error = true; _error = true;
dValue = 0; dValue = 0;
} }
else else
{ {
dValue = result; //if result equal 0
value = QString(qApp->LocaleToString(result) + " " + postfix); if (checkZero && qFuzzyIsNull(result))
_error = false; {
value = QString("0");
_error = true;
dValue = 0;
}
else
{
dValue = result;
value = QString(qApp->LocaleToString(result) + " " + postfix);
_error = false;
}
} }
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)

126
src/libs/vtools/dialogs/tools/dialogrotation.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>309</width> <width>285</width>
<height>189</height> <height>189</height>
</rect> </rect>
</property> </property>
@ -18,68 +18,6 @@
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QPlainTextEdit" name="plainTextEditFormula">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>28</height>
</size>
</property>
<property name="toolTip">
<string>Calulation</string>
</property>
<property name="tabChangesFocus">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonGrowLength">
<property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset theme="go-down">
<normaloff/>
</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item alignment="Qt::AlignLeft"> <item alignment="Qt::AlignLeft">
@ -199,6 +137,68 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QPlainTextEdit" name="plainTextEditFormula">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>28</height>
</size>
</property>
<property name="toolTip">
<string>Calulation</string>
</property>
<property name="tabChangesFocus">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonGrowLength">
<property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset theme="go-down">
<normaloff/>
</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">

27
src/libs/vtools/dialogs/tools/dialogtool.cpp
View File

@ -49,6 +49,7 @@
#include <QSettings> #include <QSettings>
#include <QPushButton> #include <QPushButton>
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include <QtNumeric>
Q_LOGGING_CATEGORY(vDialog, "v.dialog") Q_LOGGING_CATEGORY(vDialog, "v.dialog")
@ -452,21 +453,31 @@ qreal DialogTool::Eval(const QString &text, bool &flag, QLabel *label, const QSt
result = cal->EvalFormula(data->PlainVariables(), formula); result = cal->EvalFormula(data->PlainVariables(), formula);
delete cal; delete cal;
//if result equal 0 if (qIsInf(result) || qIsNaN(result))
if (checkZero && qFuzzyIsNull(result))
{ {
flag = false; flag = false;
ChangeColor(labelEditFormula, Qt::red); ChangeColor(labelEditFormula, Qt::red);
label->setText(tr("Error") + " (" + postfix + ")"); label->setText(tr("Error") + " (" + postfix + ")");
label->setToolTip(tr("Value can't be 0")); label->setToolTip(tr("Invalid value"));
} }
else else
{ {
label->setText(qApp->LocaleToString(result) + " " +postfix); //if result equal 0
flag = true; if (checkZero && qFuzzyIsNull(result))
ChangeColor(labelEditFormula, okColor); {
label->setToolTip(tr("Value")); flag = false;
emit ToolTip(""); ChangeColor(labelEditFormula, Qt::red);
label->setText(tr("Error") + " (" + postfix + ")");
label->setToolTip(tr("Value can't be 0"));
}
else
{
label->setText(qApp->LocaleToString(result) + " " +postfix);
flag = true;
ChangeColor(labelEditFormula, okColor);
label->setToolTip(tr("Value"));
emit ToolTip("");
}
} }
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)

18
src/libs/vtools/tools/drawTools/vdrawtool.cpp
View File

@ -36,6 +36,8 @@
#include "../../undocommands/savetooloptions.h" #include "../../undocommands/savetooloptions.h"
#include "../../../ifc/exception/vexceptionundo.h" #include "../../../ifc/exception/vexceptionundo.h"
#include <QtNumeric>
qreal VDrawTool::factor = 1; qreal VDrawTool::factor = 1;
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -295,10 +297,15 @@ qreal VDrawTool::CheckFormula(const quint32 &toolId, QString &formula, VContaine
cal = new Calculator(); cal = new Calculator();
result = cal->EvalFormula(data->PlainVariables(), formula); result = cal->EvalFormula(data->PlainVariables(), formula);
delete cal; delete cal;
if (qIsInf(result) || qIsNaN(result))
{
qDebug() << "Invalid the formula value";
return 0;
}
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)
{ {
//Q_UNUSED(e)
qDebug() << "\nMath parser error:\n" qDebug() << "\nMath parser error:\n"
<< "--------------------------------------\n" << "--------------------------------------\n"
<< "Message: " << e.GetMsg() << "\n" << "Message: " << e.GetMsg() << "\n"
@ -328,8 +335,15 @@ qreal VDrawTool::CheckFormula(const quint32 &toolId, QString &formula, VContaine
delete dialog; delete dialog;
Calculator *cal1 = new Calculator(); Calculator *cal1 = new Calculator();
result = cal1->EvalFormula(data->PlainVariables(), formula); result = cal1->EvalFormula(data->PlainVariables(), formula);
delete cal1; /* Here can be memory leak, but dialog already check this formula and delete cal1; /* Here can be memory leak, but dialog already checked this formula and
probability very low. */ probability very low. */
if (qIsInf(result) || qIsNaN(result))
{
qDebug() << "Invalid the formula value";
return 0;
}
break; break;
} }
else else

6
src/libs/vtools/visualization/visualization.cpp
View File

@ -32,6 +32,7 @@
#include "../../vpatterndb/vtranslatevars.h" #include "../../vpatterndb/vtranslatevars.h"
#include <QGraphicsEllipseItem> #include <QGraphicsEllipseItem>
#include <QtNumeric>
Q_LOGGING_CATEGORY(vVis, "v.visualization") Q_LOGGING_CATEGORY(vVis, "v.visualization")
@ -160,6 +161,11 @@ qreal Visualization::FindVal(const QString &expression, const QHash<QString, qre
Calculator *cal = new Calculator(); Calculator *cal = new Calculator();
val = cal->EvalFormula(vars, formula); val = cal->EvalFormula(vars, formula);
delete cal; delete cal;
if (qIsInf(val) || qIsNaN(val))
{
val = 0;
}
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)
{ {