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

Wrong conversion expression if number has 0 in fractional part. Example 10,0.

Browse Source 
Such numbers ignored and left untouched. This cause error in calculation.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-02-05 13:56:51 +02:00
parent 278c4e7ee8
commit e64e3a9044
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/app/core/vapplication.cpp
View File

@ -1771,27 +1771,25 @@ QString VApplication::FormulaFromUser(const QString &formula)
QList<QString> nValues = numbers.values(); QList<QString> nValues = numbers.values();
for (int i = 0; i < nKeys.size(); ++i) for (int i = 0; i < nKeys.size(); ++i)
{ {
loc = QLocale::system();
bool ok = false; bool ok = false;
qreal d = loc.toDouble(nValues.at(i), &ok); const qreal d = loc.toDouble(nValues.at(i), &ok);
if (ok == false) if (ok == false)
{ {
qDebug()<<"Can't convert to double token"<<nValues.at(i); qDebug()<<"Can't convert to double token"<<nValues.at(i);
continue; continue;
} }
if (qFloor (d) < d)
{
QLocale loc = QLocale(QLocale::C);
QString dStr = loc.toString(d);
newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
int bias = nValues.at(i).length() - dStr.length();
if (bias != 0)
{
CorrectionsPositions(nKeys.at(i), bias, tokens, numbers);
nKeys = numbers.keys();
nValues = numbers.values();
}
}
loc = QLocale(QLocale::C);
const QString dStr = loc.toString(d);
newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
const int bias = nValues.at(i).length() - dStr.length();
if (bias != 0)
{
CorrectionsPositions(nKeys.at(i), bias, tokens, numbers);
nKeys = numbers.keys();
nValues = numbers.values();
}
} }
} }
@ -1885,27 +1883,24 @@ QString VApplication::FormulaToUser(const QString &formula)
QList<QString> nValues = numbers.values(); QList<QString> nValues = numbers.values();
for (int i = 0; i < nKeys.size(); ++i) for (int i = 0; i < nKeys.size(); ++i)
{ {
QLocale loc = QLocale(QLocale::C); loc = QLocale(QLocale::C);
bool ok = false; bool ok = false;
qreal d = loc.toDouble(nValues.at(i), &ok); const qreal d = loc.toDouble(nValues.at(i), &ok);
if (ok == false) if (ok == false)
{ {
qDebug()<<"Can't convert to double token"<<nValues.at(i); qDebug()<<"Can't convert to double token"<<nValues.at(i);
continue; continue;
} }
if (qFloor (d) < d)
{
QLocale loc = QLocale::system();
QString dStr = loc.toString(d);
newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
int bias = nValues.at(i).length() - dStr.length();
if (bias != 0) loc = QLocale::system();
{ const QString dStr = loc.toString(d);
CorrectionsPositions(nKeys.at(i), bias, tokens, numbers); newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
nKeys = numbers.keys(); const int bias = nValues.at(i).length() - dStr.length();
nValues = numbers.values(); if (bias != 0)
} {
CorrectionsPositions(nKeys.at(i), bias, tokens, numbers);
nKeys = numbers.keys();
nValues = numbers.values();
} }
} }
} }