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

style and consistency:

Browse Source 
* rename CStatusMessages to CStatusMessageList
* rename NetworkVatlib to CNetworkVatlib
* replace all occurrences of Realname with RealName (correct camel case)
* CSequence method corresponding to CList::append is push_back
* don't compile the qdbuscpp2xml metadata plugin by default
* CAircraftIcao string members always trimmed and capitalized
* added CComSystem::roundTo25KHz
* using epsilon comparison in a couple of places

refs #81
This commit is contained in:
Klaus Basan
2014-01-07 23:00:39 +00:00
committed by Mathew Sutcliffe
parent b5c3a5543f
commit bb61654a29
80 changed files with 846 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/blackcore/context_network.h
View File

@@ -11,22 +11,17 @@
#include "blackcore/context_network_interface.h"
#include "blackmisc/avallclasses.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessages.h"
#include <QObject>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QTimer>
#include <QMap>
#include "blackmisc/statusmessagelist.h"
class QNetworkAccessManager;
class QNetworkReply;
#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "blackcore.contextnetwork"
namespace BlackCore
{
class CCoreRuntime;
/*!
* \brief Network context
*/
@@ -90,7 +85,7 @@ namespace BlackCore
// needs to be crosschecked with the latest version of Qt
virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const
{
this->log(Q_FUNC_INFO);
// this->log(Q_FUNC_INFO);
return m_atcStationsOnline;
}
@@ -101,7 +96,7 @@ namespace BlackCore
// If I make this &getAtcStations XML is not generated correctly
virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const
{
this->log(Q_FUNC_INFO);
// this->log(Q_FUNC_INFO);
return m_atcStationsBooked;
}
@@ -112,7 +107,7 @@ namespace BlackCore
// If I make this &getAtcStations XML is not generated correctly
virtual const BlackMisc::Aviation::CAircraftList getAircraftsInRange() const
{
this->log(Q_FUNC_INFO);
// this->log(Q_FUNC_INFO);
return m_aircraftsInRange;
}
@@ -120,13 +115,13 @@ namespace BlackCore
* \brief Connect to Network
* \return
*/
virtual BlackMisc::CStatusMessages connectToNetwork();
virtual BlackMisc::CStatusMessageList connectToNetwork();
/*!
* \brief Disconnect from network
* \return
*/
virtual BlackMisc::CStatusMessages disconnectFromNetwork();
virtual BlackMisc::CStatusMessageList disconnectFromNetwork();
/*!
* \brief Network connected?
@@ -139,7 +134,7 @@ namespace BlackCore
* \param aircraft
* \return
*/
virtual BlackMisc::CStatusMessages setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
virtual BlackMisc::CStatusMessageList setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
/*!
* \brief Update own position
@@ -193,7 +188,8 @@ namespace BlackCore
BlackMisc::Aviation::CAircraftList m_aircraftsInRange;
BlackCore::INetwork *m_network;
BlackMisc::Aviation::CAircraft m_ownAircraft;
QMap<QString, BlackMisc::Aviation::CInformationMessage> m_metarCache;
QMap<QString, BlackMisc::Aviation::CInformationMessage> m_metarCache /*!< Keep METARs for a while */;
QMap<QString, QString> m_atisMessageBuilder; /*!< ATIS consists of several parts, complete ATIS needs to be concatenated */
// for reading XML
QNetworkAccessManager *m_networkManager;
@@ -230,18 +226,6 @@ namespace BlackCore
return m_atcStationsBooked;
}
/*!
* \brief Check position update before sending to network
*/
void sendOwnAircraftCheckedPositionUpdateToNetwork() const;
/*!
* \brief Own aircraft details
* \param aircraft
* \return
*/
BlackMisc::CStatusMessages sendOwnAircraftDetails();
/*!
* \brief Init my very onw aircraft
*/
@@ -276,11 +260,12 @@ namespace BlackCore
void psFsdAtcControllerDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
/*!
* \brief ATIS received
* \brief ATIS received (also relevant to get voice server)
* \param callsign
* \param lineType
* \param atisMessage
*/
void psFsdAtisQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &atisMessage);
void psFsdAtisQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, Cvatlib_Network::atisLineType lineType, const QString &atisMessage);
/*!
* \brief METAR received