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

Ref T129, fixed typo

Browse Source
This commit is contained in:
Klaus Basan
2017-10-03 23:01:16 +02:00
committed by Mathew Sutcliffe
parent 7b212c65bb
commit a070e0e215
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/aircraftmatcher.cpp
View File

@@ -135,17 +135,17 @@ namespace BlackCore
return matchedModel; return matchedModel;
} }
CAircraftModel CAircraftMatcher::reverselLookupModel(const CCallsign &callsign, const CAircraftIcaoCode &networkAircraftIcao, const CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString, CAircraftModel::ModelType type, CStatusMessageList *log) CAircraftModel CAircraftMatcher::reverseLookupModel(const CCallsign &callsign, const CAircraftIcaoCode &networkAircraftIcao, const CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString, CAircraftModel::ModelType type, CStatusMessageList *log)
{ {
CLivery livery; CLivery livery;
livery.setAirlineIcaoCode(networkAirlineIcao); livery.setAirlineIcaoCode(networkAirlineIcao);
CAircraftModel model(networkModelString, type, "", networkAircraftIcao, livery); CAircraftModel model(networkModelString, type, "", networkAircraftIcao, livery);
model.setCallsign(callsign); model.setCallsign(callsign);
model = CAircraftMatcher::reverselLookupModel(model, networkLiveryInfo, log); model = CAircraftMatcher::reverseLookupModel(model, networkLiveryInfo, log);
return model; return model;
} }
CAircraftModel CAircraftMatcher::reverselLookupModel(const CAircraftModel &modelToLookup, const QString &networkLiveryInfo, CStatusMessageList *log) CAircraftModel CAircraftMatcher::reverseLookupModel(const CAircraftModel &modelToLookup, const QString &networkLiveryInfo, CStatusMessageList *log)
{ {
Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing sApp"); Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing sApp");
Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "No web services"); Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "No web services");

4
src/blackcore/aircraftmatcher.h
View File

@@ -82,7 +82,7 @@ namespace BlackCore
//! Try to find the corresponding data in DB and get best information for given data //! Try to find the corresponding data in DB and get best information for given data
//! \threadsafe //! \threadsafe
static BlackMisc::Simulation::CAircraftModel reverselLookupModel( static BlackMisc::Simulation::CAircraftModel reverseLookupModel(
const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CCallsign &callsign,
const BlackMisc::Aviation::CAircraftIcaoCode &networkAircraftIcao, const BlackMisc::Aviation::CAircraftIcaoCode &networkAircraftIcao,
const BlackMisc::Aviation::CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString, const BlackMisc::Aviation::CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString,
@@ -91,7 +91,7 @@ namespace BlackCore
//! Try to find the corresponding data in DB and get best information for following matching //! Try to find the corresponding data in DB and get best information for following matching
//! \threadsafe //! \threadsafe
static BlackMisc::Simulation::CAircraftModel reverselLookupModel( static BlackMisc::Simulation::CAircraftModel reverseLookupModel(
const BlackMisc::Simulation::CAircraftModel &modelToLookup, const BlackMisc::Simulation::CAircraftModel &modelToLookup,
const QString &networkLiveryInfo, BlackMisc::CStatusMessageList *log = nullptr); const QString &networkLiveryInfo, BlackMisc::CStatusMessageList *log = nullptr);

5
src/blackcore/airspacemonitor.cpp
View File

@@ -945,7 +945,7 @@ namespace BlackCore
this->addReverseLookupMessage(callsign, QString("Setting telephoy designator '%1'").arg(telephony)); this->addReverseLookupMessage(callsign, QString("Setting telephoy designator '%1'").arg(telephony));
} }
} }
return CAircraftMatcher::reverselLookupModel(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log); return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log);
} }
bool CAirspaceMonitor::addNewAircraftInRange(const CSimulatedAircraft &aircraft) bool CAirspaceMonitor::addNewAircraftInRange(const CSimulatedAircraft &aircraft)
@@ -1069,9 +1069,8 @@ namespace BlackCore
const CCallsign callsign(situation.getCallsign()); const CCallsign callsign(situation.getCallsign());
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Empty callsign"); Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Empty callsign");
CAircraftSituation fullSituation(situation);
// store situation history // store situation history
CAircraftSituation fullSituation(situation);
this->storeAircraftSituation(fullSituation); this->storeAircraftSituation(fullSituation);
{ {
//! \fixme Workaround to consolidate time offset from storeAircraftSituation //! \fixme Workaround to consolidate time offset from storeAircraftSituation

4
src/blackgui/components/modelmatchercomponent.cpp
View File

@@ -114,7 +114,7 @@ namespace BlackGui
if (ui->cb_withReverseLookup->isChecked()) if (ui->cb_withReverseLookup->isChecked())
{ {
const QString liveryString(ui->comp_LiverySelector->getRawCombinedCode()); const QString liveryString(ui->comp_LiverySelector->getRawCombinedCode());
const CAircraftModel reverseModel = CAircraftMatcher::reverselLookupModel(remoteAircraft.getModel(), liveryString, &msgs); const CAircraftModel reverseModel = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), liveryString, &msgs);
remoteAircraft.setModel(reverseModel); remoteAircraft.setModel(reverseModel);
} }
@@ -131,7 +131,7 @@ namespace BlackGui
this->m_matcher.setDefaultModel(CModelMatcherComponent::defaultModel()); this->m_matcher.setDefaultModel(CModelMatcherComponent::defaultModel());
const CSimulatedAircraft remoteAircraft(createAircraft()); const CSimulatedAircraft remoteAircraft(createAircraft());
const QString livery(ui->comp_LiverySelector->getRawCombinedCode()); const QString livery(ui->comp_LiverySelector->getRawCombinedCode());
const CAircraftModel matched = CAircraftMatcher::reverselLookupModel(remoteAircraft.getModel(), livery, &msgs); const CAircraftModel matched = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), livery, &msgs);
ui->te_Results->setText(matched.toQString(true)); ui->te_Results->setText(matched.toQString(true));
ui->tvp_ResultMessages->updateContainer(msgs); ui->tvp_ResultMessages->updateContainer(msgs);
} }