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

Formatting, minor fix

Browse Source
This commit is contained in:
Klaus Basan
2018-03-22 01:26:50 +01:00
parent 3f9ec92fb4
commit 7a05a5ae3a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -643,7 +643,7 @@ namespace BlackCore
{ {
Q_ASSERT(m_airspace); Q_ASSERT(m_airspace);
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; }
bool c = m_airspace->updateAircraftModel(callsign, model, originator); const bool c = m_airspace->updateAircraftModel(callsign, model, originator);
if (c) if (c)
{ {
const CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); const CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign));
@@ -686,7 +686,7 @@ namespace BlackCore
bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered) bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered)
{ {
bool c = m_airspace->updateAircraftRendered(callsign, rendered); const bool c = m_airspace->updateAircraftRendered(callsign, rendered);
return c; return c;
} }

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

@@ -127,10 +127,6 @@ namespace BlackMisc
//! \threadsafe //! \threadsafe
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered) = 0; virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered) = 0;
//! Ground elevation of aircraft
//! \threadsafe
virtual bool updateAircraftGroundElevation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Geo::CElevationPlane &elevation) = 0;
//! Mark all as not rendered //! Mark all as not rendered
//! \threadsafe //! \threadsafe
virtual void updateMarkAllAsNotRendered() = 0; virtual void updateMarkAllAsNotRendered() = 0;
@@ -147,6 +143,10 @@ namespace BlackMisc
//! \threadsafe //! \threadsafe
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0; virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0;
//! Ground elevation of aircraft
//! \threadsafe
virtual bool updateAircraftGroundElevation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Geo::CElevationPlane &elevation) = 0;
//! Get reverse lookup meesages //! Get reverse lookup meesages
//! \threadsafe //! \threadsafe
virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0; virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
@@ -179,9 +179,9 @@ namespace BlackMisc
//! \note receiver is required for connection type //! \note receiver is required for connection type
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals( virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver, QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot, std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot, std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot, std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot,
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshot std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshot
) = 0; ) = 0;

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

@@ -142,7 +142,7 @@ namespace BlackMisc
bool CRemoteAircraftProviderDummy::updateAircraftGroundElevation(const CCallsign &callsign, const CElevationPlane &elevation) bool CRemoteAircraftProviderDummy::updateAircraftGroundElevation(const CCallsign &callsign, const CElevationPlane &elevation)
{ {
CPropertyIndexVariantMap vm({ CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundSpeed }, CVariant::fromValue(elevation)); CPropertyIndexVariantMap vm({ CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundElevationPlane }, CVariant::fromValue(elevation));
const int c = this->m_aircraft.applyIfCallsign(callsign, vm); const int c = this->m_aircraft.applyIfCallsign(callsign, vm);
return c > 0; return c > 0;
} }