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

Ref T323, better parsing of altitude values

Browse Source 
- assume "24000" also as FL
- epsilon comparison
- use 0-9 char functions
- style
This commit is contained in:
Klaus Basan
2018-09-09 02:34:58 +02:00
parent b67e9ca316
commit 1243d6e93a
3 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackmisc/aviation/altitude.cpp
View File

@@ -11,6 +11,7 @@
#include "blackmisc/pq/measurementunit.h"
#include "blackmisc/pq/constants.h"
#include "blackmisc/pq/pqstring.h"
#include "blackmisc/math/mathutils.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/icons.h"
@@ -20,6 +21,7 @@
#include <QStringBuilder>
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Math;
namespace BlackMisc
{
@@ -73,7 +75,7 @@ namespace BlackMisc
static const QString n("null");
if (this->isNull()) { return n; }
if (this->m_datum == FlightLevel)
if (m_datum == FlightLevel)
{
static const QString fls("FL%1");
const int fl = qRound(this->CLength::value(CLengthUnit::ft()) / 100.0);
@@ -88,14 +90,14 @@ namespace BlackMisc
void CAltitude::toFlightLevel()
{
Q_ASSERT(this->m_datum == MeanSeaLevel || this->m_datum == FlightLevel);
this->m_datum = FlightLevel;
Q_ASSERT(m_datum == MeanSeaLevel || m_datum == FlightLevel);
m_datum = FlightLevel;
}
void CAltitude::toMeanSeaLevel()
{
Q_ASSERT(this->m_datum == MeanSeaLevel || this->m_datum == FlightLevel);
this->m_datum = MeanSeaLevel;
Q_ASSERT(m_datum == MeanSeaLevel || m_datum == FlightLevel);
m_datum = MeanSeaLevel;
}
void CAltitude::convertToPressureAltitude(const CPressure &seaLevelPressure)
@@ -129,13 +131,23 @@ namespace BlackMisc
QString v = value.trimmed();
// special case FL
if (v.contains("FL", Qt::CaseInsensitive))
if (v.contains("FL", Qt::CaseInsensitive) || v.startsWith("F"))
{
v = v.replace("FL", "", Qt::CaseInsensitive).trimmed();
v = char09OnlyString(value);
bool ok = false;
double dv = v.toDouble(&ok) * 100.0;
const CAltitude a(ok ? dv : 0.0, FlightLevel,
ok ? CLengthUnit::ft() : nullptr);
const int dv = v.toInt(&ok) * 100;
const CAltitude a(ok ? dv : 0.0, FlightLevel, ok ? CLengthUnit::ft() : nullptr);
*this = a;
return;
}
// special case A (altitude
if (v.contains("ALT", Qt::CaseInsensitive) || v.startsWith("A"))
{
v = char09OnlyString(value);
bool ok = false;
const int dv = v.toInt(&ok) * 100;
const CAltitude a(ok ? dv : 0.0, MeanSeaLevel, ok ? CLengthUnit::ft() : nullptr);
*this = a;
return;
}
@@ -282,7 +294,7 @@ namespace BlackMisc
if (msgs) { msgs->push_back(CStatusMessage(this).validationError("FL range is 10-999")); }
return false;
}
if (fmod(flInt, 5) != 0)
if (!CMathUtils::epsilonZero(fmod(flInt, 5)))
{
if (msgs) { msgs->push_back(CStatusMessage(this).validationError("FL needs to end with 0 or 5")); }
return false;
@@ -295,8 +307,6 @@ namespace BlackMisc
QString CAltitude::asFpAltitudeString() const
{
if (this->isNull()) { return QStringLiteral(""); }
if (this->isFlightLevel())
{
if (this->getUnit() == CLengthUnit::m())