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

refs #267, extended ICAO class

Browse Source
This commit is contained in:
Klaus Basan
2014-06-15 19:24:58 +02:00
parent 426dd4a09e
commit b8390f470c
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/avaircrafticao.cpp
View File

@@ -89,6 +89,17 @@ namespace BlackMisc
return TupleConverter<CAircraftIcao>::toTuple(*this) == TupleConverter<CAircraftIcao>::toTuple(other);
}
bool CAircraftIcao::matchesWildcardIcao(const CAircraftIcao &otherIcao) const
{
if ((*this) == otherIcao) return true;
if (otherIcao.hasAircraftDesignator() && otherIcao.getAircraftDesignator() != this->getAircraftDesignator()) return false;
if (otherIcao.hasAirlineDesignator() && otherIcao.getAirlineDesignator() != this->getAirlineDesignator()) return false;
if (otherIcao.hasAircraftCombinedType() && otherIcao.getAircraftCombinedType() != this->getAircraftCombinedType()) return false;
if (otherIcao.hasLivery() && otherIcao.getLivery() != this->getLivery()) return false;
if (otherIcao.hasAircraftColor() && otherIcao.getAircraftColor() != this->getAircraftColor()) return false;
return true;
}
/*
* Unequal?
*/

14
src/blackmisc/avaircrafticao.h
View File

@@ -25,9 +25,18 @@ namespace BlackMisc
//! Default constructor.
CAircraftIcao() {}
//! Default constructor.
//! Constructor.
explicit CAircraftIcao(const QString &icao) : m_aircraftDesignator(icao.trimmed().toUpper()) {}
/*!
* Constructor.
* \param icao "B737"
* \param airline "DLH"
*/
CAircraftIcao(const QString &icao, const QString &airline)
: m_aircraftDesignator(icao.trimmed().toUpper()), m_airlineDesignator(airline.trimmed().toUpper())
{}
/*!
* Constructor.
* \param icao "B737"
@@ -113,6 +122,9 @@ namespace BlackMisc
//! Equal operator ==
bool operator ==(const CAircraftIcao &other) const;
//! Matches wildcard icao object
bool matchesWildcardIcao(const CAircraftIcao &otherIcao) const;
//! Unequal operator !=
bool operator !=(const CAircraftIcao &other) const;