flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +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
committed by Mat Sutcliffe
parent bab053a0a2
commit 4e24edcb0a
4 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackmisc/simulation/matchingscript.cpp
View File

@@ -15,21 +15,19 @@ namespace BlackMisc
{
namespace Simulation
{
MSInOutValues::MSInOutValues(
const QString &cs,
const CAircraftIcaoCode aircraftIcao,
const CAirlineIcaoCode airlineIcao,
const QString &livery, int liveryId) :
MSInOutValues(cs,
MSInOutValues::MSInOutValues(const CCallsign &cs,
const CAircraftIcaoCode aircraftIcao,
const CAirlineIcaoCode airlineIcao,
const QString &livery, int liveryId) :
MSInOutValues(cs.asString(), cs.getStringAsSet(), cs.getFlightNumber(),
aircraftIcao.getDesignator(), aircraftIcao.getCombinedType(), aircraftIcao.getDbKey(),
airlineIcao.getDesignator(), airlineIcao.getVDesignator(), airlineIcao.getDbKey(),
livery, liveryId)
{ }
MSInOutValues::MSInOutValues(
const QString &cs,
const CAircraftIcaoCode aircraftIcao,
const CLivery livery) :
MSInOutValues::MSInOutValues(const CCallsign &cs,
const CAircraftIcaoCode aircraftIcao,
const CLivery livery) :
MSInOutValues(cs,
aircraftIcao,
livery.getAirlineIcaoCode(),
@@ -37,14 +35,14 @@ namespace BlackMisc
{ }
MSInOutValues::MSInOutValues(const CAircraftModel &model) :
MSInOutValues(model.getCallsign().asString(), model.getAircraftIcaoCode(), model.getLivery())
MSInOutValues(model.getCallsign(), model.getAircraftIcaoCode(), model.getLivery())
{ }
MSInOutValues::MSInOutValues(const MSInOutValues &sv) :
MSInOutValues(sv.m_callsign,
sv.getAircraftIcao(), sv.getCombinedType(), sv.getDbAircraftIcaoId(),
sv.getAirlineIcao(), sv.getVirtualAirlineIcao(), sv.getDbAirlineIcaoId(),
sv.getLivery(), sv.getDbLiveryId(),
MSInOutValues(sv.m_callsign, sv.m_callsignAsSet, sv.m_flightNumber,
sv.getAircraftIcao(), sv.getCombinedType(), sv.getDbAircraftIcaoId(),
sv.getAirlineIcao(), sv.getVirtualAirlineIcao(), sv.getDbAirlineIcaoId(),
sv.getLivery(), sv.getDbLiveryId(),
sv.m_logMessage,
sv.isModified(), sv.isRerun())
{ }