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

refs #452 updated VATSIM readers

Browse Source 
* use CSimulatedAircraft
* changed signatures from CAircraftIcaoData (removed) to CAircraftIcaoCode
* Formatting
This commit is contained in:
Klaus Basan
2015-09-23 18:41:51 +02:00
committed by Mathew Sutcliffe
parent a8e8e5527a
commit a8a26bc281
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackcore/vatsimdatafilereader.h
View File

@@ -14,12 +14,12 @@
#include "blackcoreexport.h"
#include "blackmisc/threadedreader.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/network/serverlist.h"
#include "blackmisc/network/userlist.h"
#include "blackmisc/network/voicecapabilities.h"
#include "blackmisc/aviation/callsignset.h"
#include <QObject>
#include <QTimer>
@@ -39,7 +39,7 @@ namespace BlackCore
//! Get aircraft
//! \threadsafe
BlackMisc::Aviation::CAircraftList getAircraft() const;
BlackMisc::Simulation::CSimulatedAircraftList getAircraft() const;
//! Get ATC station
//! \threadsafe
@@ -85,9 +85,13 @@ namespace BlackCore
//! \threadsafe
BlackMisc::Network::CUserList getPilotsForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! ICAO info for callsign
//! Aircraft ICAO info for callsign
//! \threadsafe
BlackMisc::Aviation::CAircraftIcaoData getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign);
BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCode(const BlackMisc::Aviation::CCallsign &callsign);
//! Airline ICAO info for callsign
//! \threadsafe
BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCode(const BlackMisc::Aviation::CCallsign &callsign);
//! Voice capability for callsign
//! \threadsafe
@@ -95,11 +99,15 @@ namespace BlackCore
//! Update aircraft with VATSIM aircraft data from data file
//! \threadsafe
void updateWithVatsimDataFileData(BlackMisc::Aviation::CAircraft &aircraftToBeUdpated) const;
void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const;
//! Start reading in own thread
void readInBackgroundThread();
signals:
//! Data have been read
void dataRead(int lines);
private slots:
//! Data have been read, parse VATSIM file
void ps_parseVatsimFile(QNetworkReply *nwReply);
@@ -111,10 +119,10 @@ namespace BlackCore
QNetworkAccessManager *m_networkManager = nullptr;
QStringList m_serviceUrls; //!< URL of the service
int m_currentUrlIndex;
BlackMisc::Network::CServerList m_voiceServers;
BlackMisc::Network::CServerList m_fsdServers;
BlackMisc::Aviation::CAtcStationList m_atcStations;
BlackMisc::Aviation::CAircraftList m_aircraft;
BlackMisc::Network::CServerList m_voiceServers;
BlackMisc::Network::CServerList m_fsdServers;
BlackMisc::Aviation::CAtcStationList m_atcStations;
BlackMisc::Simulation::CSimulatedAircraftList m_aircraft;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Network::CVoiceCapabilities> m_voiceCapabilities;
//! Split line and assign values to their corresponding attribute names
@@ -133,9 +141,6 @@ namespace BlackCore
//! Get current section
static Section currentLineToSection(const QString &currentLine);
signals:
//! Data have been read
void dataRead(int lines);
};
}