flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T424, PQ strings without (thousand) separators

Browse Source 
* separator can cause issue when sending data (WebService, FSD)
* re-parsing (print and parse again) can cause to undesired results as the separator is mistaken as decimal separator with a different locale
* separator now a parameter so it can still be used
This commit is contained in:
Klaus Basan
2018-11-04 00:33:12 +01:00
parent 7b209685dd
commit ef21ec67f3
6 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/pq/measurementunit.cpp
View File

@@ -35,9 +35,9 @@ namespace BlackMisc
return m_data->m_fromDefault(unit.m_data->m_toDefault(value));
}
QString CMeasurementUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
QString CMeasurementUnit::makeRoundedQStringWithUnit(double value, int digits, bool withGroupSeparator, bool i18n) const
{
return this->makeRoundedQString(value, digits).append(this->getSymbol(i18n));
return this->makeRoundedQString(value, digits, withGroupSeparator).append(this->getSymbol(i18n));
}
double CMeasurementUnit::roundValue(double value, int digits) const
@@ -52,12 +52,21 @@ namespace BlackMisc
return CMathUtils::roundEpsilon(value, this->getEpsilon());
}
QString CMeasurementUnit::makeRoundedQString(double value, int digits, bool i18n) const
QString CMeasurementUnit::makeRoundedQString(double value, int digits, bool withGroupSeparator, bool i18n) const
{
Q_UNUSED(i18n);
if (digits < 0) digits = m_data->m_displayDigits;
if (digits < 0) { digits = m_data->m_displayDigits; }
const double v = CMathUtils::round(value, digits);
const QString s = QLocale::system().toString(v, 'f', digits);
// create locale without separator
static const QLocale localeWithoutSeparator = []
{
QLocale q = QLocale::system();
q.setNumberOptions(QLocale::OmitGroupSeparator);
return q;
}();
const QString s = (withGroupSeparator ? QLocale::system() : localeWithoutSeparator).toString(v, 'f', digits);
return s;
}
} // namespace