flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #395, renamed to updateFastPositionEnabled (consistency with other member functions)

Browse Source
This commit is contained in:
Klaus Basan
2015-04-19 16:48:41 +02:00
committed by Mathew Sutcliffe
parent ecc4c787a1
commit acec379151
14 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/airspace_monitor.cpp
View File

@@ -154,7 +154,7 @@ namespace BlackCore
return c > 0;
}
bool CAirspaceMonitor::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator)
bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator)
{
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositonUpdates));
Q_UNUSED(originator);

6
src/blackcore/airspace_monitor.h
View File

@@ -30,9 +30,7 @@
namespace BlackCore
{
/*!
* Keeps track of other entities in the airspace: aircraft, ATC stations, etc.
*/
//! Keeps track of other entities in the airspace: aircraft, ATC stations, etc.
class BLACKCORE_EXPORT CAirspaceMonitor :
public QObject,
public BlackMisc::Simulation::IRemoteAircraftProvider, // those data will be provided from the class CAirspaceMonitor
@@ -70,7 +68,7 @@ namespace BlackCore
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
//! Returns the list of users we know about
BlackMisc::Network::CUserList getUsers() const;

10
src/blackcore/airspace_watchdog.cpp
View File

@@ -10,13 +10,13 @@
#include "airspace_watchdog.h"
#include "blackmisc/logmessage.h"
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
namespace BlackCore
{
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
CAirspaceWatchdog::CAirspaceWatchdog(QObject *parent)
: QObject(parent)
{
@@ -77,4 +77,4 @@ namespace BlackCore
}
}
}
}
} // ns

2
src/blackcore/context_network.h
View File

@@ -242,7 +242,7 @@ namespace BlackCore
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0;
//! Change fast position updates
virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) = 0;
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) = 0;
//! Create dummy ATC stations for performance tests etc.
virtual void testCreateDummyOnlineAtcStations(int number) = 0;

4
src/blackcore/context_network_empty.h
View File

@@ -250,8 +250,8 @@ namespace BlackCore
return false;
}
//! \copydoc IContextNetwork::updateFastPositionUpdates
virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override
//! \copydoc IContextNetwork::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override
{
logEmptyContextWarning(Q_FUNC_INFO);
Q_UNUSED(callsign);

4
src/blackcore/context_network_impl.cpp
View File

@@ -538,10 +538,10 @@ namespace BlackCore
return c;
}
bool CContextNetwork::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator)
bool CContextNetwork::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enableFastPositonUpdates << originator; }
bool c = this->m_airspace->updateFastPositionUpdates(callsign, enableFastPositonUpdates, originator);
bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator);
if (c)
{
CSimulatedAircraft aircraft(this->remoteAircraft().findFirstByCallsign(callsign));

4
src/blackcore/context_network_impl.h
View File

@@ -182,8 +182,8 @@ namespace BlackCore
//! \copydoc IContextNetwork::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IContextNetwork::updateFastPositionUpdates
virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
//! \copydoc IContextNetwork::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) override;
//! \copydoc IContextNetwork::isFastPositionSendingEnabled
virtual bool isFastPositionSendingEnabled() const override;

4
src/blackcore/context_network_proxy.cpp
View File

@@ -188,9 +188,9 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftModel"), callsign, model, originator);
}
bool CContextNetworkProxy::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositionSending, const QString &originator)
bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending, const QString &originator)
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateFastPositionUpdates"), callsign, enableFastPositionSending, originator);
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateFastPositionEnabled"), callsign, enableFastPositionSending, originator);
}
bool CContextNetworkProxy::isFastPositionSendingEnabled() const

4
src/blackcore/context_network_proxy.h
View File

@@ -135,8 +135,8 @@ namespace BlackCore
//! \copydoc IContextNetwork::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IContextNetwork::updateFastPositionUpdates
virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override;
//! \copydoc IContextNetwork::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending, const QString &originator) override;
//! \copydoc IContextNetwork::isFastPositionSendingEnabled
virtual bool isFastPositionSendingEnabled() const override;

3
src/blackcore/interpolator.h
View File

@@ -84,7 +84,6 @@ namespace BlackCore
CSituationsPerCallsign getSituationsByCallsign() const;
//! Parts before given offset time (aka pending parts)
//! \note
//! \threadsafe
virtual BlackMisc::Aviation::CAircraftPartsList getAndRemovePartsBeforeTime(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTime, PartsStatus &partsStatus);
@@ -92,7 +91,7 @@ namespace BlackCore
//! \threadsafe
virtual void clear();
//! Knows callsign?
//! Does know callsign?
//! \threadsafe
virtual bool hasDataForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;

2
src/blackgui/components/mappingcomponent.cpp
View File

@@ -338,7 +338,7 @@ namespace BlackGui
{
if (getIContextNetwork())
{
getIContextNetwork()->updateFastPositionUpdates(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingtOriginator());
getIContextNetwork()->updateFastPositionEnabled(aircraft.getCallsign(), aircraft.fastPositionUpdates(), mappingtOriginator());
}
}

2
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -87,7 +87,7 @@ namespace BlackMisc
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0;
//! Change fast position updates
virtual bool updateFastPositionUpdates(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0;
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0;
};
//! Class which can be directly used to access an \sa IRemoteAircraftProviderReadOnly object

2
src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
View File

@@ -73,7 +73,7 @@ namespace BlackMisc
return n > 0;
}
bool CRemoteAircraftProviderDummy::updateFastPositionUpdates(const CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator)
bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator)
{
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositionUpdates));

4
src/blackmisc/simulation/remoteaircraftproviderdummy.h
View File

@@ -63,8 +63,8 @@ namespace BlackMisc
//! \copydoc IRemoteAircraftProvider::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateFastPositionUpdates
virtual bool updateFastPositionUpdates(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override;
//! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override;
//! For testing, add new situation and fire signals
void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);