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

INetwork: refactor request/reply pattern and sending position updates to be more encapsulated

Browse Source 
refs #81
This commit is contained in:
Mathew Sutcliffe
2013-12-31 17:57:44 +00:00
parent 7cbfca1402
commit c77951743e
5 changed files with 178 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/blackcore/network_vatlib.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/avallclasses.h"
#include <vatlib/vatlib.h>
#include <QScopedPointer>
#include <QBasicTimer>
#include <QTimer>
#include <QTextCodec>
#include <QByteArray>
@@ -29,9 +29,6 @@ namespace BlackCore
NetworkVatlib(QObject *parent = nullptr);
virtual ~NetworkVatlib();
protected: // QObject overrides
virtual void timerEvent(QTimerEvent *);
public: // INetwork slots overrides
// Network
@@ -44,7 +41,6 @@ namespace BlackCore
virtual void sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendNameQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendCapabilitiesQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void replyToNameQuery(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
virtual void ping(const BlackMisc::Aviation::CCallsign &callsign);
// Weather
@@ -55,15 +51,22 @@ namespace BlackCore
// Aircraft
virtual void requestAircraftInfo(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendAircraftInfo(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icao);
virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void replyToFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &freq);
virtual void setOwnAircraftPosition(const BlackMisc::Aviation::CAircraftSituation &aircraft);
virtual void setOwnAircraftTransponder(const BlackMisc::Aviation::CTransponder &xpdr);
virtual void setOwnAircraftFrequency(const BlackMisc::PhysicalQuantities::CFrequency &freq);
virtual void setOwnAircraftIcao(const BlackMisc::Aviation::CAircraftIcao &icao);
// ATC
virtual void sendAtcQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendAtisQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void requestMetar(const QString &airportICAO);
private slots:
void replyToFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign);
void replyToNameQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendAircraftInfo(const BlackMisc::Aviation::CCallsign &callsign);
private: //shimlib callbacks
static void onConnectionStatusChanged(Cvatlib_Network *, Cvatlib_Network::connStatus oldStatus, Cvatlib_Network::connStatus newStatus, void *cbvar);
static void onTextMessageReceived(Cvatlib_Network *, const char *from, const char *to, const char *msg, void *cbvar);
@@ -93,6 +96,10 @@ namespace BlackCore
QString fromFSD(const char *cstr) const;
bool isDisconnected() const { return m_status == Cvatlib_Network::connStatus_Idle || m_status == Cvatlib_Network::connStatus_Disconnected; }
private slots:
void process();
void update();
signals:
void terminate();
@@ -107,14 +114,20 @@ namespace BlackCore
private:
QScopedPointer<Cvatlib_Network, VatlibQScopedPointerDeleter> m_net;
Cvatlib_Network::connStatus m_status;
QBasicTimer m_timer;
BlackMisc::Network::CServer m_server;
static int const c_updateIntervalMillisecs = 100;
static int const c_logoffTimeoutSeconds = 5;
QTimer m_processingTimer;
QTimer m_updateTimer;
static int const c_processingIntervalMsec = 100;
static int const c_updateIntervalMsec = 5000;
static int const c_logoffTimeoutSec = 5;
QByteArray m_callsign;
QByteArray m_realname;
BlackMisc::Aviation::CAircraftSituation m_ownAircraft;
BlackMisc::Aviation::CTransponder m_ownTransponder;
BlackMisc::PhysicalQuantities::CFrequency m_ownFrequency;
BlackMisc::Aviation::CAircraftIcao m_ownAircraftIcao;
QTextCodec *m_fsdTextCodec;
};