mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-03 16:25:54 +08:00
Added "isWeatherActivated" based on the discussion with LT
This commit is contained in:
committed by
Mat Sutcliffe
parent
f98ba0e494
commit
6ca6d12851
@@ -278,6 +278,9 @@ namespace BlackCore
|
|||||||
//! Reset model by matching it again
|
//! Reset model by matching it again
|
||||||
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) = 0;
|
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) = 0;
|
||||||
|
|
||||||
|
//! Is simulator weather activated or deactivated?
|
||||||
|
virtual bool isWeatherActivated() const = 0;
|
||||||
|
|
||||||
//! Activates or deactivates simulator weather
|
//! Activates or deactivates simulator weather
|
||||||
virtual void setWeatherActivated(bool activated) = 0;
|
virtual void setWeatherActivated(bool activated) = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -318,6 +318,13 @@ namespace BlackCore
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//! \copydoc IContextSimulator::isWeatherActivated
|
||||||
|
virtual bool isWeatherActivated() const override
|
||||||
|
{
|
||||||
|
logEmptyContextWarning(Q_FUNC_INFO);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
//! \copydoc IContextSimulator::setWeatherActivated
|
//! \copydoc IContextSimulator::setWeatherActivated
|
||||||
virtual void setWeatherActivated(bool activated) override
|
virtual void setWeatherActivated(bool activated) override
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -979,10 +979,15 @@ namespace BlackCore
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CContextSimulator::isWeatherActivated() const
|
||||||
|
{
|
||||||
|
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
|
||||||
|
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return m_isWeatherActivated; }
|
||||||
|
return m_simulatorPlugin.second->isWeatherActivated();
|
||||||
|
}
|
||||||
|
|
||||||
void CContextSimulator::setWeatherActivated(bool activated)
|
void CContextSimulator::setWeatherActivated(bool activated)
|
||||||
{
|
{
|
||||||
m_isWeatherActivated = activated;
|
|
||||||
|
|
||||||
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
|
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
|
||||||
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; }
|
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; }
|
||||||
m_simulatorPlugin.second->setWeatherActivated(activated);
|
m_simulatorPlugin.second->setWeatherActivated(activated);
|
||||||
|
|||||||
@@ -111,9 +111,10 @@ namespace BlackCore
|
|||||||
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
||||||
virtual void recalculateAllAircraft() override;
|
virtual void recalculateAllAircraft() override;
|
||||||
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
||||||
|
virtual bool isWeatherActivated() const override;
|
||||||
virtual void setWeatherActivated(bool activated) override;
|
virtual void setWeatherActivated(bool activated) override;
|
||||||
virtual void requestWeatherGrid(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier) override;
|
virtual void requestWeatherGrid(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier) override;
|
||||||
virtual int doMatchingsAgain() override;
|
virtual int doMatchingsAgain() override;
|
||||||
virtual bool doMatchingAgain(const BlackMisc::Aviation::CCallsign &callsign) override;
|
virtual bool doMatchingAgain(const BlackMisc::Aviation::CCallsign &callsign) override;
|
||||||
virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
|
virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
|
||||||
virtual bool isMatchingMessagesEnabled() const override;
|
virtual bool isMatchingMessagesEnabled() const override;
|
||||||
@@ -267,7 +268,7 @@ namespace BlackCore
|
|||||||
bool m_wasSimulating = false;
|
bool m_wasSimulating = false;
|
||||||
bool m_initallyAddAircraft = false;
|
bool m_initallyAddAircraft = false;
|
||||||
bool m_enableMatchingMessages = true;
|
bool m_enableMatchingMessages = true;
|
||||||
bool m_isWeatherActivated = false;
|
bool m_isWeatherActivated = false; // used to activate after plugin is loaded
|
||||||
|
|
||||||
QString m_networkSessionId; //!< Network session of CServer::getServerSessionId, if not connected empty (for statistics, ..)
|
QString m_networkSessionId; //!< Network session of CServer::getServerSessionId, if not connected empty (for statistics, ..)
|
||||||
BlackMisc::Simulation::CBackgroundValidation *m_validator = nullptr;
|
BlackMisc::Simulation::CBackgroundValidation *m_validator = nullptr;
|
||||||
|
|||||||
@@ -287,6 +287,11 @@ namespace BlackCore
|
|||||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("resetToModelMatchingAircraft"), callsign);
|
return m_dBusInterface->callDBusRet<bool>(QLatin1String("resetToModelMatchingAircraft"), callsign);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CContextSimulatorProxy::isWeatherActivated() const
|
||||||
|
{
|
||||||
|
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isWeatherActivated"));
|
||||||
|
}
|
||||||
|
|
||||||
void CContextSimulatorProxy::setWeatherActivated(bool activated)
|
void CContextSimulatorProxy::setWeatherActivated(bool activated)
|
||||||
{
|
{
|
||||||
m_dBusInterface->callDBus(QLatin1String("setWeatherActivated"), activated);
|
m_dBusInterface->callDBus(QLatin1String("setWeatherActivated"), activated);
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ namespace BlackCore
|
|||||||
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
||||||
virtual void recalculateAllAircraft() override;
|
virtual void recalculateAllAircraft() override;
|
||||||
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
|
||||||
|
virtual bool isWeatherActivated() const override;
|
||||||
virtual void setWeatherActivated(bool activated) override;
|
virtual void setWeatherActivated(bool activated) override;
|
||||||
virtual void requestWeatherGrid(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier) override;
|
virtual void requestWeatherGrid(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier) override;
|
||||||
virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
|
virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
|
||||||
|
|||||||
@@ -116,6 +116,11 @@ namespace BlackCore
|
|||||||
this->setUpdateAllRemoteAircraft();
|
this->setUpdateAllRemoteAircraft();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ISimulator::isWeatherActivated() const
|
||||||
|
{
|
||||||
|
return m_isWeatherActivated;
|
||||||
|
}
|
||||||
|
|
||||||
void ISimulator::setWeatherActivated(bool activated)
|
void ISimulator::setWeatherActivated(bool activated)
|
||||||
{
|
{
|
||||||
m_isWeatherActivated = activated;
|
m_isWeatherActivated = activated;
|
||||||
|
|||||||
@@ -177,6 +177,9 @@ namespace BlackCore
|
|||||||
//! Recalculate all aircraft
|
//! Recalculate all aircraft
|
||||||
virtual void recalculateAllAircraft();
|
virtual void recalculateAllAircraft();
|
||||||
|
|
||||||
|
//! Weather activated
|
||||||
|
virtual bool isWeatherActivated() const ;
|
||||||
|
|
||||||
//! Activates or deactivates simulator weather
|
//! Activates or deactivates simulator weather
|
||||||
virtual void setWeatherActivated(bool activated);
|
virtual void setWeatherActivated(bool activated);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user