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

Ref T696 Fix number formatting for CTime and CAngle.

Browse Source 
- Removed the 'L' in the format strings, so the C locale is used.
- Added `1 + digits` to the `fieldWidth`, as this actually includes the
  decimal point and the digits after it.
This commit is contained in:
Mat Sutcliffe
2019-06-30 23:18:28 +01:00
committed by Klaus Basan
parent a8d2916e9e
commit 6115f7d093
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/pq/units.cpp
View File

@@ -51,9 +51,9 @@ namespace BlackMisc
double de = CMathUtils::trunc(value); double de = CMathUtils::trunc(value);
double mi = CMathUtils::trunc((value - de) * 100.0); double mi = CMathUtils::trunc((value - de) * 100.0);
double se = CMathUtils::trunc((value - de - mi / 100.0) * 1000000) / 100.0; double se = CMathUtils::trunc((value - de - mi / 100.0) * 1000000) / 100.0;
const char *fmt = value < 0 ? "-%L1 %L2 %L3" : "%L1 %L2 %L3"; const char *fmt = value < 0 ? "-%1 %2 %3" : "%1 %2 %3";
s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt;
s = s.arg(fabs(de), 0, 'f', 0).arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 2, 'f', digits, '0'); s = s.arg(fabs(de), 0, 'f', 0).arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 3 + digits, 'f', digits, '0');
} }
else if ((*this) == CAngleUnit::sexagesimalDegMin()) else if ((*this) == CAngleUnit::sexagesimalDegMin())
{ {
@@ -61,9 +61,9 @@ namespace BlackMisc
Q_ASSERT(digits >= 0); Q_ASSERT(digits >= 0);
double de = CMathUtils::trunc(value); double de = CMathUtils::trunc(value);
double mi = CMathUtils::trunc((value - de) * 100.0); double mi = CMathUtils::trunc((value - de) * 100.0);
const char *fmt = value < 0 ? "-%L1 %L2" : "%L1 %L2"; const char *fmt = value < 0 ? "-%1 %2" : "%1 %2";
s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt;
s = s.arg(fabs(de), 0, 'f', 0).arg(fabs(mi), 2, 'f', digits, '0'); s = s.arg(fabs(de), 0, 'f', 0).arg(fabs(mi), 3 + digits, 'f', digits, '0');
} }
else else
{ {
@@ -83,9 +83,9 @@ namespace BlackMisc
double hr = CMathUtils::trunc(value); double hr = CMathUtils::trunc(value);
double mi = CMathUtils::trunc((value - hr) * 100.0); double mi = CMathUtils::trunc((value - hr) * 100.0);
double se = CMathUtils::trunc((value - hr - mi / 100.0) * 1000000) / 100.0; double se = CMathUtils::trunc((value - hr - mi / 100.0) * 1000000) / 100.0;
const char *fmt = value < 0 ? "-%L1h%L2m%L3s" : "%L1h%L2m%L3s"; const char *fmt = value < 0 ? "-%1h%2m%3s" : "%1h%2m%3s";
s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt;
s = s.arg(fabs(hr), 2, 'f', 0, '0').arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 2, 'f', digits, '0'); s = s.arg(fabs(hr), 2, 'f', 0, '0').arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 3 + digits, 'f', digits, '0');
} }
else if ((*this) == CTimeUnit::hrmin()) else if ((*this) == CTimeUnit::hrmin())
{ {
@@ -93,9 +93,9 @@ namespace BlackMisc
Q_ASSERT(digits >= 0); Q_ASSERT(digits >= 0);
double hr = CMathUtils::trunc(value); double hr = CMathUtils::trunc(value);
double mi = CMathUtils::trunc((value - hr) * 100.0); double mi = CMathUtils::trunc((value - hr) * 100.0);
const char *fmt = value < 0 ? "-%L1h%L2m" : "%L1h%L2m"; const char *fmt = value < 0 ? "-%1h%2m" : "%1h%2m";
s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt;
s = s.arg(fabs(hr), 2, 'f', 0, '0').arg(fabs(mi), 2, 'f', digits, '0'); s = s.arg(fabs(hr), 2, 'f', 0, '0').arg(fabs(mi), 3 + digits, 'f', digits, '0');
} }
else if ((*this) == CTimeUnit::minsec()) else if ((*this) == CTimeUnit::minsec())
{ {
@@ -103,9 +103,9 @@ namespace BlackMisc
Q_ASSERT(digits >= 0); Q_ASSERT(digits >= 0);
double mi = CMathUtils::trunc(value); double mi = CMathUtils::trunc(value);
double se = CMathUtils::trunc((value - mi) * 100.0); double se = CMathUtils::trunc((value - mi) * 100.0);
const char *fmt = value < 0 ? "-%L2m%L3s" : "%L2m%L3s"; const char *fmt = value < 0 ? "-%2m%3s" : "%2m%3s";
s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt; s = i18n ? QCoreApplication::translate("CMeasurementUnit", fmt) : fmt;
s = s.arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 2, 'f', digits, '0'); s = s.arg(fabs(mi), 2, 'f', 0, '0').arg(fabs(se), 3 + digits, 'f', digits, '0');
} }
else else
{ {

5
tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.cpp
View File

@@ -241,6 +241,11 @@ namespace BlackMiscTest
QVERIFY2(CMathUtils::epsilonEqual(t6.value(), 1.0101), "Switching the unit produced a wrong a value"); QVERIFY2(CMathUtils::epsilonEqual(t6.value(), 1.0101), "Switching the unit produced a wrong a value");
t7.parseFromString("27:30:55"); t7.parseFromString("27:30:55");
QVERIFY2(t7.formattedHrsMinSec() == "27:30:55", "Parsed time greater than 24h failed"); QVERIFY2(t7.formattedHrsMinSec() == "27:30:55", "Parsed time greater than 24h failed");
CTime t8(7680, CTimeUnit::s());
t8.switchUnit(CTimeUnit::hrmin());
qDebug() << t8.valueRoundedWithUnit();
QVERIFY2(t8.valueRoundedWithUnit() == "02h08.0m", "valueRoundedWithUnit in hrmin correctly formatted");
} }
void CTestPhysicalQuantities::accelerationTests() void CTestPhysicalQuantities::accelerationTests()