From b9aab7e5b31bc3db9779918c9cc90ad96cdd872f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 12 May 2019 00:06:19 +0200 Subject: [PATCH] Ref T658, matching settings for reverse lookup in airspace monitor --- src/blackcore/airspacemonitor.cpp | 2 +- src/blackcore/airspacemonitor.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 303602c04..1308236dd 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -837,7 +837,7 @@ namespace BlackCore CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Used aircraft ICAO: '%1'").arg(aircraftIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Used airline ICAO: '%1'").arg(airlineIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); - return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, liveryString, modelString, type, log); + return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, liveryString, modelString, m_matchingSettings.get(), type, log); } bool CAirspaceMonitor::addNewAircraftInRange(const CSimulatedAircraft &aircraft) diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index 0c8a7d109..a44185795 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -13,13 +13,13 @@ #include "blackcore/network.h" #include "blackcore/blackcoreexport.h" +#include "blackmisc/simulation/settings/modelmatchersettings.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/matchinglog.h" #include "blackmisc/simulation/ownaircraftprovider.h" #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/simulation/simulationenvironmentprovider.h" -#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/network/clientprovider.h" #include "blackmisc/network/userlist.h" @@ -182,10 +182,11 @@ namespace BlackCore BlackMisc::Aviation::CAtcStationList m_atcStationsBooked; //!< booked ATC stations QHash m_tempFsInnPackets; QHash m_flightPlanCache; //!< flight plan information retrieved from network and cached + BlackMisc::CSettingReadOnly m_matchingSettings { this }; //!< settings INetwork *m_network = nullptr; //!< corresponding network interface CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer - bool m_bookingsRequested = false; //!< bookings have been requested, it can happen we receive an BlackCore::Vatsim::CVatsimBookingReader::atcBookingsReadUnchanged signal + bool m_bookingsRequested = false; //!< bookings have been requested, it can happen we receive an BlackCore::Vatsim::CVatsimBookingReader::atcBookingsReadUnchanged signal //! Remove ATC online stations void removeAllOnlineAtcStations();