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

Abort export if cannot retrive a value.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-09-27 15:23:40 +03:00
parent ac96ce6b84
commit d01edb53c3
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/dialogs/dialogfinalmeasurements.ui
View File

@ -102,7 +102,7 @@
<bool>true</bool> <bool>true</bool>
</attribute> </attribute>
<attribute name="verticalHeaderVisible"> <attribute name="verticalHeaderVisible">
<bool>false</bool> <bool>true</bool>
</attribute> </attribute>
<attribute name="verticalHeaderCascadingSectionResizes"> <attribute name="verticalHeaderCascadingSectionResizes">
<bool>false</bool> <bool>false</bool>

30
src/app/valentina/mainwindowsnogui.cpp
View File

@ -1596,7 +1596,6 @@ void MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo
csv.insertRow(i); csv.insertRow(i);
csv.setText(i, 0, m.name); // name csv.setText(i, 0, m.name); // name
qreal result = 0;
if (not m.formula.isEmpty()) if (not m.formula.isEmpty())
{ {
try try
@ -1605,20 +1604,33 @@ void MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, boo
// Replace line return character with spaces for calc if exist // Replace line return character with spaces for calc if exist
f.replace("\n", " "); f.replace("\n", " ");
QScopedPointer<Calculator> cal(new Calculator()); QScopedPointer<Calculator> cal(new Calculator());
result = cal->EvalFormula(completeData.DataVariables(), f); const qreal result = cal->EvalFormula(completeData.DataVariables(), f);
csv.setText(i, 1, qApp->LocaleToString(result)); // value
if (qIsInf(result) || qIsNaN(result)) if (qIsInf(result) || qIsNaN(result))
{ {
result = 0; qCritical("%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")),
} qUtf8Printable(tr("Value in line %1 is infinite or NaN. Please, check your calculations.")
} .arg(i+1)));
catch (qmu::QmuParserError &) if (not VApplication::IsGUIMode())
{ {
result = 0; qApp->exit(V_EX_DATAERR);
}
return;
}
}
catch (qmu::QmuParserError &e)
{
qCritical("%s\n\n%s", qUtf8Printable(tr("Export final measurements error.")),
qUtf8Printable(tr("Parser error at line %1: %2.").arg(i+1).arg(e.GetMsg())));
if (not VApplication::IsGUIMode())
{
qApp->exit(V_EX_DATAERR);
}
return;
} }
} }
csv.setText(i, 1, qApp->LocaleToString(result)); // value
} }
csv.toCSV(fileName, withHeader, separator, QTextCodec::codecForMib(mib)); csv.toCSV(fileName, withHeader, separator, QTextCodec::codecForMib(mib));