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

Ref T658, matching script support for flight number and callsign "as set"

Browse Source
This commit is contained in:
Klaus Basan
2019-06-13 21:43:51 +02:00
parent 35a441ac5b
commit a53a62ac77
4 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/blackmisc/simulation/matchingscript.h
View File

@@ -31,6 +31,8 @@ namespace BlackMisc
//! MSNetworkValues properties @{
Q_PROPERTY(QString callsign READ getCallsign WRITE setCallsign NOTIFY callsignChanged)
Q_PROPERTY(QString callsignAsSet READ getCallsignAsSet)
Q_PROPERTY(QString flightNumber READ getFlightNumber)
Q_PROPERTY(int dbAircraftIcaoId READ getDbAircraftIcaoId WRITE setDbAircraftIcaoId NOTIFY dbAircraftIcaoIdChanged)
Q_PROPERTY(int dbAirlineIcaoId READ getDbAirlineIcaoId WRITE setDbAirlineIcaoId NOTIFY dbAirlineIcaoIdChanged)
Q_PROPERTY(int dbLiveryId READ getDbLiveryId WRITE setDbLiveryId NOTIFY dbLiveryIdChanged)
@@ -57,13 +59,13 @@ namespace BlackMisc
Q_INVOKABLE MSInOutValues() {}
//! Ctor
Q_INVOKABLE MSInOutValues(const QString &cs,
Q_INVOKABLE MSInOutValues(const QString &cs, const QString &csAsSet, const QString &flightNumber,
const QString &aircraftIcao, const QString &combinedType, int idAircraftIcao,
const QString &airlineIcao, const QString &virtualAirlineIcao, int idAirlineIcao,
const QString &livery, int liveryId,
const QString &logMsg = {},
bool modified = false, bool rerun = false) :
m_callsign(cs.trimmed().toUpper()),
m_callsign(cs.trimmed().toUpper()), m_callsignAsSet(csAsSet), m_flightNumber(flightNumber),
m_aircraftIcao(aircraftIcao.trimmed().toUpper()), m_combinedType(combinedType.trimmed().toUpper()),
m_airlineIcao(airlineIcao.trimmed().toUpper()), m_vAirlineIcao(virtualAirlineIcao),
m_livery(livery.trimmed().toUpper()),
@@ -73,13 +75,13 @@ namespace BlackMisc
{}
//! Ctor
MSInOutValues(const QString &cs,
MSInOutValues(const BlackMisc::Aviation::CCallsign &cs,
const BlackMisc::Aviation::CAircraftIcaoCode aircraftIcao,
const BlackMisc::Aviation::CAirlineIcaoCode airlineIcao,
const QString &livery, int liveryId);
//! Ctor
MSInOutValues(const QString &cs,
MSInOutValues(const BlackMisc::Aviation::CCallsign &cs,
const BlackMisc::Aviation::CAircraftIcaoCode aircraftIcao,
const BlackMisc::Aviation::CLivery livery);
@@ -89,11 +91,12 @@ namespace BlackMisc
//! Ctor
MSInOutValues(const MSInOutValues &sv);
//! Get callsign
const QString &getCallsign() const { return m_callsign; }
//! Set callsign
//! Callsign values @{
const QString &getCallsign() const { return m_callsign; }
const QString &getCallsignAsSet() const { return m_callsignAsSet; }
const QString &getFlightNumber() const { return m_flightNumber; }
void setCallsign(const QString &callsign);
//! @}
//! Values found in DB? @{
bool isFoundDbAircraftIcao() const { return m_dbAircraftIcaoId >= 0; }
@@ -193,6 +196,8 @@ namespace BlackMisc
private:
QString m_callsign;
QString m_callsignAsSet;
QString m_flightNumber;
QString m_aircraftIcao;
QString m_combinedType;
QString m_airlineIcao;