flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting from refs #678

Browse Source
This commit is contained in:
Klaus Basan
2016-06-23 20:08:13 +02:00
parent 12d06aceef
commit 2dec348c8c
5 changed files with 28 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
samples/blackmiscdbus/servicetool.h
View File

@@ -33,11 +33,10 @@ namespace BlackMisc { class CDBusServer; }
namespace BlackSample
{
class Testservice; // forward declaration
/*!
* \brief Supporting / helper functions for running the tests
* Supporting / helper functions for running the tests
*/
class ServiceTool
{
@@ -45,92 +44,45 @@ namespace BlackSample
ServiceTool() {}
public:
/*!
* \brief Get process id
* \return
*/
//! Process id
static qint64 getPid()
{
return QCoreApplication::applicationPid();
}
/*!
* \brief Client side of data transfer test
* \param address
*/
//! Client side of data transfer test
static void dataTransferTestClient(const QString &address);
/*!
* \brief Server side of data transfer test
*/
//! Server side of data transfer test
static void dataTransferTestServer(BlackMisc::CDBusServer *dBusServer);
/*!
* \brief Start a new process
* \param executable
* \param arguments
* \param parent
* \return
*/
//! Start a new process
static QProcess *startNewProcess(const QString &executable, const QStringList &arguments = QStringList(), QObject *parent = 0);
/*!
* \brief Loop to send data to test service (slots on server)
* \param connection
*/
//! Loop to send data to test service (slots on server)
static void sendDataToTestservice(const QDBusConnection &connection);
/*!
* \brief Display QDBusArgument
* \param arg
* \param level
*/
//! Display QDBusArgument
static void displayQDBusArgument(const QDBusArgument &arg, qint32 level = 0);
/*!
* \brief Register testservice with connection
* \param connection
* \param parent
* \return test service object
*/
//! Register testservice with connection
static Testservice *registerTestservice(QDBusConnection &connection, QObject *parent = 0);
/*!
* \brief Get a random callsign
* \return
*/
//! Get a random callsign
static BlackMisc::Aviation::CCallsign getRandomAtcCallsign();
/*!
* \brief Get stations
* \param number
* \return
*/
//! Get stations
static BlackMisc::Aviation::CAtcStationList getStations(int number);
/*!
* \brief Get aircraft cfg entries
* \param number
* \return
*/
//! Get aircraft cfg entries
static BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntries(int number);
/*!
* \brief Get airports
* \param number
* \return
*/
//! Get airports
static BlackMisc::Aviation::CAirportList getAirports(int number);
/*!
* \brief Get clients
* \param number
* \return
*/
//! Get clients
static BlackMisc::Network::CClientList getClients(int number);
};
} // namespace
#endif // guard

58
src/blackcore/airspacemonitor.h
View File

@@ -75,65 +75,25 @@ namespace BlackCore
//! Constructor
CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, INetwork *network, QObject *parent);
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRange
//! \name IRemoteAircraftProvider overrides
//! \ingroup remoteaircraftprovider
//! @{
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeForCallsign
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeForCallsign
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeCount
//! \ingroup remoteaircraftprovider
virtual int getAircraftInRangeCount() const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSituations
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSituationsCount
//! \ingroup remoteaircraftprovider
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore = -1) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftModel
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateFastPositionEnabled
//! \ingroup remoteaircraftprovider
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftRendered
//! \ingroup remoteaircraftprovider
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateMarkAllAsNotRendered
//! \ingroup remoteaircraftprovider
virtual void updateMarkAllAsNotRendered(const BlackMisc::CIdentifier &originator) override;
//! @}
//! Returns the list of users we know about
BlackMisc::Network::CUserList getUsers() const;
@@ -231,14 +191,14 @@ namespace BlackCore
void airspaceAircraftSnapshot(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &snapshot);
private:
BlackMisc::Aviation::CAtcStationList m_atcStationsOnline;
BlackMisc::Aviation::CAtcStationList m_atcStationsBooked;
BlackMisc::Network::CClientList m_otherClients;
BlackMisc::Simulation::CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required
BlackMisc::Aviation::CAtcStationList m_atcStationsOnline; //!< online ATC stations
BlackMisc::Aviation::CAtcStationList m_atcStationsBooked; //!< booked ATC stations
BlackMisc::Network::CClientList m_otherClients; //!< client informatiom
BlackMisc::Simulation::CSimulatedAircraftList m_aircraftInRange; //!< aircraft, thread safe access required
// hashs, because not sorted by key but keeping order
CSituationsPerCallsign m_situationsByCallsign; //!< situations, for performance reasons per callsign, thread safe access required
CPartsPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign, thread safe access required
CSituationsPerCallsign m_situationsByCallsign; //!< situations, for performance reasons per callsign, thread safe access required
CPartsPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign, thread safe access required
BlackMisc::Aviation::CCallsignSet m_aircraftSupportingParts; //!< aircraft supporting parts, thread safe access required
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache; //!< flight plan information retrieved any cached

2
src/blackcore/webdataservices.cpp
View File

@@ -397,7 +397,7 @@ namespace BlackCore
return 0;
}
CAirlineIcaoCodeList CWebDataServices::getAirlineIcaoCodeForDesignator(const QString &designator) const
CAirlineIcaoCodeList CWebDataServices::getAirlineIcaoCodesForDesignator(const QString &designator) const
{
if (m_icaoDataReader) { return m_icaoDataReader->getAirlineIcaoCodesForDesignator(designator); }
return CAirlineIcaoCodeList();

4
src/blackcore/webdataservices.h
View File

@@ -230,9 +230,9 @@ namespace BlackCore
//! \threadsafe
int getAirlineIcaoCodesCount() const;
//! ICAO code for designator
//! ICAO codes for designator
//! \threadsafe
BlackMisc::Aviation::CAirlineIcaoCodeList getAirlineIcaoCodeForDesignator(const QString &designator) const;
BlackMisc::Aviation::CAirlineIcaoCodeList getAirlineIcaoCodesForDesignator(const QString &designator) const;
//! ICAO code for id
//! \threadsafe

6
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -105,9 +105,9 @@ namespace BlackMisc
bool CAircraftModel::canInitializeFromFsd() const
{
bool nw = this->getModelType() == CAircraftModel::TypeQueriedFromNetwork ||
this->getModelType() == CAircraftModel::TypeFsdData ||
this->getModelType() == CAircraftModel::TypeUnknown;
const bool nw = this->getModelType() == CAircraftModel::TypeQueriedFromNetwork ||
this->getModelType() == CAircraftModel::TypeFsdData ||
this->getModelType() == CAircraftModel::TypeUnknown;
return nw;
}