From 8a4415ce0736cc380a0e68a0e364846afec03330 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 1 Oct 2017 22:11:47 +0200 Subject: [PATCH] Ref T129, parsed flight remarks can be obtained from VATSIM reader --- src/blackcore/vatsim/vatsimdatafilereader.cpp | 8 ++++++++ src/blackcore/vatsim/vatsimdatafilereader.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index 81f331b5e..d30a12351 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -135,6 +135,14 @@ namespace BlackCore return m_flightPlanRemarks.value(callsign); } + CFlightPlanUtils::FlightPlanRemarks CVatsimDataFileReader::getParsedFlightPlanRemarksForCallsign(const CCallsign &callsign) const + { + if (callsign.isEmpty()) return CFlightPlanUtils::parseFlightPlanRemarks(""); + const QString remarks = this->getFlightPlanRemarksForCallsign(callsign); + const CVoiceCapabilities vc = this->getVoiceCapabilityForCallsign(callsign); + return CFlightPlanUtils::parseFlightPlanRemarks(remarks, vc); + } + void CVatsimDataFileReader::updateWithVatsimDataFileData(CSimulatedAircraft &aircraftToBeUdpated) const { this->getAircraft().updateWithVatsimDataFileData(aircraftToBeUdpated); diff --git a/src/blackcore/vatsim/vatsimdatafilereader.h b/src/blackcore/vatsim/vatsimdatafilereader.h index 1fd010f22..087025d2f 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.h +++ b/src/blackcore/vatsim/vatsimdatafilereader.h @@ -113,6 +113,10 @@ namespace BlackCore //! \threadsafe QString getFlightPlanRemarksForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const; + //! Parsed flight plan remarks for callsign + //! \threadsafe + BlackMisc::Aviation::CFlightPlanUtils::FlightPlanRemarks getParsedFlightPlanRemarksForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const; + //! Update aircraft with VATSIM aircraft data from data file //! \threadsafe void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const;