Formatting

This commit is contained in:
Klaus Basan
2018-03-26 02:49:59 +02:00
parent b28fb0e154
commit 785e35ee88
9 changed files with 25 additions and 20 deletions

View File

@@ -209,6 +209,6 @@ namespace BlackCore
if (!wasValid) { return; } // ignore the 1st snapshot
}
emit airspaceAircraftSnapshot(snapshot);
emit this->airspaceAircraftSnapshot(snapshot);
}
} // ns

View File

@@ -118,9 +118,9 @@ namespace BlackCore
// watchdog
CCallsignTimestampSet m_aircraftCallsignTimestamps; //!< for watchdog (pilots)
CCallsignTimestampSet m_atcCallsignTimestamps; //!< for watchdog (ATC)
BlackMisc::PhysicalQuantities::CTime m_timeoutAircraft = {15, BlackMisc::PhysicalQuantities::CTimeUnit::s() }; //!< Timeout value for watchdog functionality
BlackMisc::PhysicalQuantities::CTime m_timeoutAtc = {50, BlackMisc::PhysicalQuantities::CTimeUnit::s() }; //!< Timeout value for watchdog functionality
qint64 m_lastWatchdogCallMsSinceEpoch;
BlackMisc::PhysicalQuantities::CTime m_timeoutAircraft = { 15, BlackMisc::PhysicalQuantities::CTimeUnit::s() }; //!< Timeout value for watchdog functionality
BlackMisc::PhysicalQuantities::CTime m_timeoutAtc = { 50, BlackMisc::PhysicalQuantities::CTimeUnit::s() }; //!< Timeout value for watchdog functionality
qint64 m_lastWatchdogCallMsSinceEpoch; //!< when last called
// snapshot
BlackMisc::Simulation::CAirspaceAircraftSnapshot m_latestAircraftSnapshot;
@@ -128,8 +128,8 @@ namespace BlackCore
bool m_simulatorRenderingEnabled = true;
int m_simulatorMaxRenderedAircraft = -1;
BlackMisc::PhysicalQuantities::CLength m_simulatorMaxRenderedDistance { 0.0, nullptr };
mutable QReadWriteLock m_lockSnapshot; //!< lock snapshot
mutable QReadWriteLock m_lockRestrictions; //!< lock simulator restrictions
mutable QReadWriteLock m_lockSnapshot; //!< lock snapshot
mutable QReadWriteLock m_lockRestrictions; //!< lock simulator restrictions
};
} // namespace

View File

@@ -201,9 +201,10 @@ namespace BlackCore
//! Angle calculation
BlackMisc::PhysicalQuantities::CAngle calculateBearingToOwnAircraft(const BlackMisc::Aviation::CAircraftSituation &situation) const;
//! Store an aircraft situation
//! Store an aircraft situation under consideration of gnd.flags/CG and elevation
//! \threadsafe
//! \remark sets gnd flag from parts if parts are available
//! \remark uses gnd elevation if found
void storeAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! Add or update aircraft
@@ -220,7 +221,7 @@ namespace BlackCore
//! Update booked station by callsign
int updateBookedStation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CPropertyIndexVariantMap &vm, bool skipEqualValues = true, bool sendSignal = true);
//! Call ps_customFSInnPacketReceived with stored packet
//! Call CAirspaceMonitor::onCustomFSInnPacketReceived with stored packet
void recallFsInnPacket(const BlackMisc::Aviation::CCallsign &callsign);
//! Send the information if aircraft and(!) client are available