mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-18 03:15:34 +08:00
refactor: Simplify signal
The CAirspaceMonitor::changedAtcStationOnlineConnectionStatus signal was only used to signal disconnected atc stations (argument always false).
This commit is contained in:
@@ -63,7 +63,7 @@ namespace BlackCore
|
|||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
c = connect(airspaceMonitorParent, &CAirspaceMonitor::removedAircraft, this, &CAirspaceAnalyzer::watchdogRemoveAircraftCallsign);
|
c = connect(airspaceMonitorParent, &CAirspaceMonitor::removedAircraft, this, &CAirspaceAnalyzer::watchdogRemoveAircraftCallsign);
|
||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
c = connect(airspaceMonitorParent, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CAirspaceAnalyzer::onChangedAtcStationOnlineConnectionStatus);
|
c = connect(airspaceMonitorParent, &CAirspaceMonitor::atcStationDisconnected, this, &CAirspaceAnalyzer::onAtcStationDisconnected);
|
||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
|
|
||||||
// --------------------
|
// --------------------
|
||||||
@@ -97,18 +97,11 @@ namespace BlackCore
|
|||||||
this->watchdogTouchAircraftCallsign(situation);
|
this->watchdogTouchAircraftCallsign(situation);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAirspaceAnalyzer::onChangedAtcStationOnlineConnectionStatus(const CAtcStation &station, bool isConnected)
|
void CAirspaceAnalyzer::onAtcStationDisconnected(const CAtcStation &station)
|
||||||
{
|
{
|
||||||
const CCallsign cs = station.getCallsign();
|
const CCallsign cs = station.getCallsign();
|
||||||
if (isConnected)
|
|
||||||
{
|
|
||||||
m_atcCallsignTimestamps[cs] = QDateTime::currentMSecsSinceEpoch();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this->watchdogRemoveAtcCallsign(cs);
|
this->watchdogRemoveAtcCallsign(cs);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void CAirspaceAnalyzer::watchdogTouchAircraftCallsign(const CAircraftSituation &situation)
|
void CAirspaceAnalyzer::watchdogTouchAircraftCallsign(const CAircraftSituation &situation)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -108,8 +108,8 @@ namespace BlackCore
|
|||||||
//! Network position update
|
//! Network position update
|
||||||
void onNetworkPositionUpdate(const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CTransponder &transponder);
|
void onNetworkPositionUpdate(const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CTransponder &transponder);
|
||||||
|
|
||||||
//! ATC stations online
|
//! ATC station disconnected
|
||||||
void onChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool isConnected);
|
void onAtcStationDisconnected(const BlackMisc::Aviation::CAtcStation &station);
|
||||||
|
|
||||||
//! Run a check
|
//! Run a check
|
||||||
void onTimeout();
|
void onTimeout();
|
||||||
|
|||||||
@@ -696,8 +696,6 @@ namespace BlackCore
|
|||||||
m_atcStationsOnline.calculcateAndUpdateRelativeDistanceAndBearing(this->getOwnAircraftSituation());
|
m_atcStationsOnline.calculcateAndUpdateRelativeDistanceAndBearing(this->getOwnAircraftSituation());
|
||||||
|
|
||||||
emit this->changedAtcStationsOnline();
|
emit this->changedAtcStationsOnline();
|
||||||
// Remark: this->changedAtcStationOnlineConnectionStatus
|
|
||||||
// will be triggered in onAtisVoiceRoomReceived
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -722,7 +720,7 @@ namespace BlackCore
|
|||||||
const CAtcStation removedStation = m_atcStationsOnline.findFirstByCallsign(callsign);
|
const CAtcStation removedStation = m_atcStationsOnline.findFirstByCallsign(callsign);
|
||||||
m_atcStationsOnline.removeByCallsign(callsign);
|
m_atcStationsOnline.removeByCallsign(callsign);
|
||||||
emit this->changedAtcStationsOnline();
|
emit this->changedAtcStationsOnline();
|
||||||
emit this->changedAtcStationOnlineConnectionStatus(removedStation, false);
|
emit this->atcStationDisconnected(removedStation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -180,8 +180,8 @@ namespace BlackCore
|
|||||||
//! Online ATC stations were changed
|
//! Online ATC stations were changed
|
||||||
void changedAtcStationsOnline();
|
void changedAtcStationsOnline();
|
||||||
|
|
||||||
//! Connection status of an ATC station was changed
|
//! ATC station disconnected
|
||||||
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool isConnected);
|
void atcStationDisconnected(const BlackMisc::Aviation::CAtcStation &station);
|
||||||
|
|
||||||
//! Raw data as received from network
|
//! Raw data as received from network
|
||||||
//! \remark used for statistics
|
//! \remark used for statistics
|
||||||
|
|||||||
@@ -136,8 +136,8 @@ namespace BlackCore::Context
|
|||||||
//! Changed gnd. flag capability
|
//! Changed gnd. flag capability
|
||||||
void changedGndFlagCapability(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
|
void changedGndFlagCapability(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
|
||||||
|
|
||||||
//! Connection status changed for online station
|
//! ATC station disconnected
|
||||||
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
|
void atcStationDisconnected(const BlackMisc::Aviation::CAtcStation &atcStation);
|
||||||
|
|
||||||
//! User has been kicked from network
|
//! User has been kicked from network
|
||||||
void kicked(const QString &kickMessage);
|
void kicked(const QString &kickMessage);
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace BlackCore::Context
|
|||||||
this->getRuntime()->getCContextSimulator(),
|
this->getRuntime()->getCContextSimulator(),
|
||||||
m_fsdClient, this);
|
m_fsdClient, this);
|
||||||
m_fsdClient->setClientProvider(m_airspace);
|
m_fsdClient->setClientProvider(m_airspace);
|
||||||
connect(m_airspace, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CContextNetwork::changedAtcStationOnlineConnectionStatus, Qt::QueuedConnection);
|
connect(m_airspace, &CAirspaceMonitor::atcStationDisconnected, this, &CContextNetwork::atcStationDisconnected, Qt::QueuedConnection);
|
||||||
connect(m_airspace, &CAirspaceMonitor::changedAtcStationsOnline, this, &CContextNetwork::changedAtcStationsOnline, Qt::QueuedConnection);
|
connect(m_airspace, &CAirspaceMonitor::changedAtcStationsOnline, this, &CContextNetwork::changedAtcStationsOnline, Qt::QueuedConnection);
|
||||||
connect(m_airspace, &CAirspaceMonitor::changedAircraftInRange, this, &CContextNetwork::changedAircraftInRange, Qt::QueuedConnection);
|
connect(m_airspace, &CAirspaceMonitor::changedAircraftInRange, this, &CContextNetwork::changedAircraftInRange, Qt::QueuedConnection);
|
||||||
connect(m_airspace, &CAirspaceMonitor::removedAircraft, this, &IContextNetwork::removedAircraft, Qt::QueuedConnection); // DBus
|
connect(m_airspace, &CAirspaceMonitor::removedAircraft, this, &IContextNetwork::removedAircraft, Qt::QueuedConnection); // DBus
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace BlackCore::Context
|
|||||||
"changedAircraftInRange", this, SIGNAL(changedAircraftInRange()));
|
"changedAircraftInRange", this, SIGNAL(changedAircraftInRange()));
|
||||||
Q_ASSERT(s);
|
Q_ASSERT(s);
|
||||||
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
||||||
"changedAtcStationOnlineConnectionStatus", this, SIGNAL(changedAtcStationOnlineConnectionStatus(BlackMisc::Aviation::CAtcStation, bool)));
|
"atcStationDisconnected", this, SIGNAL(atcStationDisconnected(BlackMisc::Aviation::CAtcStation)));
|
||||||
Q_ASSERT(s);
|
Q_ASSERT(s);
|
||||||
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
||||||
"changedAircraftInRangeDigest", this, SIGNAL(changedAircraftInRangeDigest()));
|
"changedAircraftInRangeDigest", this, SIGNAL(changedAircraftInRangeDigest()));
|
||||||
|
|||||||
@@ -449,9 +449,8 @@ namespace BlackCore::Context
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CContextOwnAircraft::xCtxChangedAtcStationOnlineConnectionStatus(const CAtcStation &atcStation, bool connected)
|
void CContextOwnAircraft::xCtxAtcStationDisconnected(const CAtcStation &atcStation)
|
||||||
{
|
{
|
||||||
Q_UNUSED(connected)
|
|
||||||
Q_UNUSED(atcStation)
|
Q_UNUSED(atcStation)
|
||||||
this->evaluateComStations(true);
|
this->evaluateComStations(true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -218,9 +218,9 @@ namespace BlackCore
|
|||||||
|
|
||||||
BlackMisc::CSetting<BlackMisc::Network::Settings::TCurrentTrafficServer> m_currentNetworkServer { this };
|
BlackMisc::CSetting<BlackMisc::Network::Settings::TCurrentTrafficServer> m_currentNetworkServer { this };
|
||||||
|
|
||||||
//! Station has been changed, needed to tune in/out voice room
|
//! Station has disconnected
|
||||||
//! \ingroup crosscontextfunction
|
//! \ingroup crosscontextfunction
|
||||||
void xCtxChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
|
void xCtxAtcStationDisconnected(const BlackMisc::Aviation::CAtcStation &atcStation);
|
||||||
|
|
||||||
//! Simulator model has been changed
|
//! Simulator model has been changed
|
||||||
//! \ingroup crosscontextfunction
|
//! \ingroup crosscontextfunction
|
||||||
|
|||||||
@@ -298,8 +298,8 @@ namespace BlackCore
|
|||||||
// -> in the core or an all local implementation
|
// -> in the core or an all local implementation
|
||||||
if (m_contextNetwork && m_contextOwnAircraft && m_contextNetwork->isUsingImplementingObject() && m_contextOwnAircraft->isUsingImplementingObject())
|
if (m_contextNetwork && m_contextOwnAircraft && m_contextNetwork->isUsingImplementingObject() && m_contextOwnAircraft->isUsingImplementingObject())
|
||||||
{
|
{
|
||||||
c = connect(m_contextNetwork, &IContextNetwork::changedAtcStationOnlineConnectionStatus,
|
c = connect(m_contextNetwork, &IContextNetwork::atcStationDisconnected,
|
||||||
this->getCContextOwnAircraft(), &CContextOwnAircraft::xCtxChangedAtcStationOnlineConnectionStatus);
|
this->getCContextOwnAircraft(), &CContextOwnAircraft::xCtxAtcStationDisconnected);
|
||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
times.insert("Post setup, connects network", time.restart());
|
times.insert("Post setup, connects network", time.restart());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ namespace BlackGui::Components
|
|||||||
if (sGui)
|
if (sGui)
|
||||||
{
|
{
|
||||||
connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationsOnlineDigest, this, &CAtcStationComponent::changedAtcStationsOnline, Qt::QueuedConnection);
|
connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationsOnlineDigest, this, &CAtcStationComponent::changedAtcStationsOnline, Qt::QueuedConnection);
|
||||||
connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationOnlineConnectionStatus, this, &CAtcStationComponent::changedAtcStationOnlineConnectionStatus, Qt::QueuedConnection);
|
connect(sGui->getIContextNetwork(), &IContextNetwork::atcStationDisconnected, this, &CAtcStationComponent::atcStationDisconnected, Qt::QueuedConnection);
|
||||||
connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CAtcStationComponent::connectionStatusChanged, Qt::QueuedConnection);
|
connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CAtcStationComponent::connectionStatusChanged, Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -245,10 +245,10 @@ namespace BlackGui::Components
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAtcStationComponent::changedAtcStationOnlineConnectionStatus(const CAtcStation &station, bool added)
|
void CAtcStationComponent::atcStationDisconnected(const CAtcStation &station)
|
||||||
{
|
{
|
||||||
// trick here is, we want to display a station ASAP
|
// trick here is, we want to display a station ASAP
|
||||||
ui->tvp_AtcStationsOnline->changedAtcStationConnectionStatus(station, added);
|
ui->tvp_AtcStationsOnline->changedAtcStationConnectionStatus(station, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAtcStationComponent::getMetarAsEntered()
|
void CAtcStationComponent::getMetarAsEntered()
|
||||||
|
|||||||
@@ -87,8 +87,8 @@ namespace BlackGui
|
|||||||
//! Set timestampd and call update
|
//! Set timestampd and call update
|
||||||
void forceUpdate();
|
void forceUpdate();
|
||||||
|
|
||||||
//! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
|
//! ATC station disconnected
|
||||||
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added);
|
void atcStationDisconnected(const BlackMisc::Aviation::CAtcStation &station);
|
||||||
|
|
||||||
//! Get all METARs
|
//! Get all METARs
|
||||||
void getMetarAsEntered();
|
void getMetarAsEntered();
|
||||||
|
|||||||
Reference in New Issue
Block a user