mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core/localized-parsing: correctly handle group and decimal separator

Browse source 
We are usually showing pressures with localized group separator. And we made a
total mess out of things when then re-parsing those values. This caused us to
ignore start and end pressures in Subsurface-mobile when those were entered in
psi and included a group separator:

2,900psi was turned into 2.900psi which we then rounded to 0 mbar.

This fixes the problem by asking Qt to do the right thing instead of doing
stupid separator magic.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-08-15 13:46:16 -07:00
parent ebcfb46d8c
commit 5299d8291d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/qthelper.cpp
View file

@ -829,10 +829,16 @@ int parsePressureToMbar(const QString &text)
{ {
int mbar; int mbar;
QString numOnly = text; QString numOnly = text;
numOnly.replace(",", ".").remove(QRegExp("[^0-9.]")); // different locales use different symbols as group separator or decimal separator
// (I think it's usually '.' and ',' - but maybe there are others?)
// let's use Qt's help to get the parsing right
QString validNumberCharacters("0-9");
validNumberCharacters += loc.decimalPoint();
validNumberCharacters += loc.groupSeparator();
numOnly.remove(QRegExp(QString("[^%1]").arg(validNumberCharacters)));
if (numOnly.isEmpty()) if (numOnly.isEmpty())
return 0; return 0;
double number = numOnly.toDouble(); double number = loc.toDouble(numOnly);
if (text.contains(gettextFromC::tr("bar"), Qt::CaseInsensitive)) { if (text.contains(gettextFromC::tr("bar"), Qt::CaseInsensitive)) {
mbar = lrint(number * 1000); mbar = lrint(number * 1000);
} else if (text.contains(gettextFromC::tr("psi"), Qt::CaseInsensitive)) { } else if (text.contains(gettextFromC::tr("psi"), Qt::CaseInsensitive)) {