flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 18:36:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T684, renamed to "getAirlinePrefix()", as airline comes first

Browse Source
This commit is contained in:
Klaus Basan
2019-06-16 20:21:24 +02:00
committed by Mat Sutcliffe
parent 0d04d3da1d
commit 5da74faad0
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/aircraftmatcher.cpp
View File

@@ -76,7 +76,7 @@ namespace BlackCore
{ {
CMatchingUtils::addLogDetailsToList(log, callsign, CMatchingUtils::addLogDetailsToList(log, callsign,
QStringLiteral("Find airline designator from 1st: '%1' 2nd: '%2' callsign: '%3', use airline callsign: %4, use web service: %5"). QStringLiteral("Find airline designator from 1st: '%1' 2nd: '%2' callsign: '%3', use airline callsign: %4, use web service: %5").
arg(primaryIcao, secondaryIcao, callsign.getAirlineSuffix(), boolToYesNo(airlineFromCallsign), boolToYesNo(useWebServices)), getLogCategories()); arg(primaryIcao, secondaryIcao, callsign.getAirlinePrefix(), boolToYesNo(airlineFromCallsign), boolToYesNo(useWebServices)), getLogCategories());
CAirlineIcaoCode code; CAirlineIcaoCode code;
do do
{ {
@@ -95,7 +95,7 @@ namespace BlackCore
CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Two invalid airline ICAO codes (primary/secondary) '%1', '%2'").arg(primaryIcao, secondaryIcao), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Two invalid airline ICAO codes (primary/secondary) '%1', '%2'").arg(primaryIcao, secondaryIcao), getLogCategories());
if (airlineFromCallsign) if (airlineFromCallsign)
{ {
const QString airlineSuffix = callsign.getAirlineSuffix(); const QString airlineSuffix = callsign.getAirlinePrefix();
if (CAircraftMatcher::isValidAirlineIcaoDesignator(airlineSuffix, useWebServices)) if (CAircraftMatcher::isValidAirlineIcaoDesignator(airlineSuffix, useWebServices))
{ {
CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Using airline from callsign '%1', suffix: '%2'").arg(callsign.toQString(), airlineSuffix), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Using airline from callsign '%1', suffix: '%2'").arg(callsign.toQString(), airlineSuffix), getLogCategories());

2
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -331,7 +331,7 @@ namespace BlackMisc
{ {
if (this->hasValidDbKey()) { return *this; } if (this->hasValidDbKey()) { return *this; }
if (callsign.isEmpty()) { return *this; } if (callsign.isEmpty()) { return *this; }
const QString callsignAirline = callsign.getAirlineSuffix(); const QString callsignAirline = callsign.getAirlinePrefix();
if (callsignAirline.isEmpty()) { return *this; } if (callsignAirline.isEmpty()) { return *this; }
if (callsignAirline == m_designator) { return *this; } if (callsignAirline == m_designator) { return *this; }

2
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -192,7 +192,7 @@ namespace BlackMisc
CAirlineIcaoCode CAirlineIcaoCodeList::findBestMatchByCallsign(const CCallsign &callsign) const CAirlineIcaoCode CAirlineIcaoCodeList::findBestMatchByCallsign(const CCallsign &callsign) const
{ {
if (this->isEmpty() || callsign.isEmpty()) { return CAirlineIcaoCode(); } if (this->isEmpty() || callsign.isEmpty()) { return CAirlineIcaoCode(); }
const QString airline = callsign.getAirlineSuffix().toUpper(); const QString airline = callsign.getAirlinePrefix().toUpper();
if (airline.isEmpty()) { return CAirlineIcaoCode(); } if (airline.isEmpty()) { return CAirlineIcaoCode(); }
const CAirlineIcaoCode airlineCode = (airline.length() == 3) ? const CAirlineIcaoCode airlineCode = (airline.length() == 3) ?
this->findFirstByOrDefault(&CAirlineIcaoCode::getDesignator, airline) : this->findFirstByOrDefault(&CAirlineIcaoCode::getDesignator, airline) :

8
src/blackmisc/aviation/callsign.cpp
View File

@@ -176,13 +176,13 @@ namespace BlackMisc
return s; return s;
} }
QString CCallsign::getAirlineSuffix() const QString CCallsign::getAirlinePrefix() const
{ {
QString flightNumber; QString flightNumber;
return this->getAirlineSuffix(flightNumber); return this->getAirlinePrefix(flightNumber);
} }
QString CCallsign::getAirlineSuffix(QString &flightNumber) const QString CCallsign::getAirlinePrefix(QString &flightNumber) const
{ {
flightNumber.clear(); flightNumber.clear();
if (m_callsign.length() < 3) { return {}; } if (m_callsign.length() < 3) { return {}; }
@@ -209,7 +209,7 @@ namespace BlackMisc
{ {
if (this->isAtcCallsign()) { return {}; } if (this->isAtcCallsign()) { return {}; }
QString flightNumber; QString flightNumber;
const QString airline = this->getAirlineSuffix(flightNumber); const QString airline = this->getAirlinePrefix(flightNumber);
return airline.isEmpty() ? QString() : flightNumber; return airline.isEmpty() ? QString() : flightNumber;
} }

4
src/blackmisc/aviation/callsign.h
View File

@@ -108,8 +108,8 @@ namespace BlackMisc
QString getSuffix() const; QString getSuffix() const;
//! Airline suffix (e.g. DLH1234 -> DLH) if applicable @{ //! Airline suffix (e.g. DLH1234 -> DLH) if applicable @{
QString getAirlineSuffix() const; QString getAirlinePrefix() const;
QString getAirlineSuffix(QString &flightNumber) const; QString getAirlinePrefix(QString &flightNumber) const;
// @} // @}
//! Flight number (e.g. DLH1234 -> 1234) if applicable //! Flight number (e.g. DLH1234 -> 1234) if applicable