flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify signal

Browse Source 
The CAirspaceMonitor::changedAtcStationOnlineConnectionStatus signal was
only used to signal disconnected atc stations (argument always false).
This commit is contained in:
Lars Toenning
2024-06-17 20:38:30 +02:00
parent d7219c4d56
commit 259cf24d6b
12 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackcore/airspaceanalyzer.cpp
View File

@@ -63,7 +63,7 @@ namespace BlackCore
Q_ASSERT(c);
c = connect(airspaceMonitorParent, &CAirspaceMonitor::removedAircraft, this, &CAirspaceAnalyzer::watchdogRemoveAircraftCallsign);
Q_ASSERT(c);
c = connect(airspaceMonitorParent, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CAirspaceAnalyzer::onChangedAtcStationOnlineConnectionStatus);
c = connect(airspaceMonitorParent, &CAirspaceMonitor::atcStationDisconnected, this, &CAirspaceAnalyzer::onAtcStationDisconnected);
Q_ASSERT(c);
// --------------------
@@ -97,17 +97,10 @@ namespace BlackCore
this->watchdogTouchAircraftCallsign(situation);
}
void CAirspaceAnalyzer::onChangedAtcStationOnlineConnectionStatus(const CAtcStation &station, bool isConnected)
void CAirspaceAnalyzer::onAtcStationDisconnected(const CAtcStation &station)
{
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)

4
src/blackcore/airspaceanalyzer.h
View File

@@ -108,8 +108,8 @@ namespace BlackCore
//! Network position update
void onNetworkPositionUpdate(const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CTransponder &transponder);
//! ATC stations online
void onChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool isConnected);
//! ATC station disconnected
void onAtcStationDisconnected(const BlackMisc::Aviation::CAtcStation &station);
//! Run a check
void onTimeout();

4
src/blackcore/airspacemonitor.cpp
View File

@@ -696,8 +696,6 @@ namespace BlackCore
m_atcStationsOnline.calculcateAndUpdateRelativeDistanceAndBearing(this->getOwnAircraftSituation());
emit this->changedAtcStationsOnline();
// Remark: this->changedAtcStationOnlineConnectionStatus
// will be triggered in onAtisVoiceRoomReceived
}
else
{
@@ -722,7 +720,7 @@ namespace BlackCore
const CAtcStation removedStation = m_atcStationsOnline.findFirstByCallsign(callsign);
m_atcStationsOnline.removeByCallsign(callsign);
emit this->changedAtcStationsOnline();
emit this->changedAtcStationOnlineConnectionStatus(removedStation, false);
emit this->atcStationDisconnected(removedStation);
}
}

4
src/blackcore/airspacemonitor.h
View File

@@ -180,8 +180,8 @@ namespace BlackCore
//! Online ATC stations were changed
void changedAtcStationsOnline();
//! Connection status of an ATC station was changed
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool isConnected);
//! ATC station disconnected
void atcStationDisconnected(const BlackMisc::Aviation::CAtcStation &station);
//! Raw data as received from network
//! \remark used for statistics

4
src/blackcore/context/contextnetwork.h
View File

@@ -136,8 +136,8 @@ namespace BlackCore::Context
//! Changed gnd. flag capability
void changedGndFlagCapability(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Connection status changed for online station
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
//! ATC station disconnected
void atcStationDisconnected(const BlackMisc::Aviation::CAtcStation &atcStation);
//! User has been kicked from network
void kicked(const QString &kickMessage);

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

@@ -97,7 +97,7 @@ namespace BlackCore::Context
this->getRuntime()->getCContextSimulator(),
m_fsdClient, this);
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::changedAircraftInRange, this, &CContextNetwork::changedAircraftInRange, Qt::QueuedConnection);
connect(m_airspace, &CAirspaceMonitor::removedAircraft, this, &IContextNetwork::removedAircraft, Qt::QueuedConnection); // DBus

2
src/blackcore/context/contextnetworkproxy.cpp
View File

@@ -52,7 +52,7 @@ namespace BlackCore::Context
"changedAircraftInRange", this, SIGNAL(changedAircraftInRange()));
Q_ASSERT(s);
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);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"changedAircraftInRangeDigest", this, SIGNAL(changedAircraftInRangeDigest()));

3
src/blackcore/context/contextownaircraftimpl.cpp
View File

@@ -449,9 +449,8 @@ namespace BlackCore::Context
return true;
}
void CContextOwnAircraft::xCtxChangedAtcStationOnlineConnectionStatus(const CAtcStation &atcStation, bool connected)
void CContextOwnAircraft::xCtxAtcStationDisconnected(const CAtcStation &atcStation)
{
Q_UNUSED(connected)
Q_UNUSED(atcStation)
this->evaluateComStations(true);
}

4
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -218,9 +218,9 @@ namespace BlackCore
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
void xCtxChangedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &atcStation, bool connected);
void xCtxAtcStationDisconnected(const BlackMisc::Aviation::CAtcStation &atcStation);
//! Simulator model has been changed
//! \ingroup crosscontextfunction

4
src/blackcore/corefacade.cpp
View File

@@ -298,8 +298,8 @@ namespace BlackCore
// -> in the core or an all local implementation
if (m_contextNetwork && m_contextOwnAircraft && m_contextNetwork->isUsingImplementingObject() && m_contextOwnAircraft->isUsingImplementingObject())
{
c = connect(m_contextNetwork, &IContextNetwork::changedAtcStationOnlineConnectionStatus,
this->getCContextOwnAircraft(), &CContextOwnAircraft::xCtxChangedAtcStationOnlineConnectionStatus);
c = connect(m_contextNetwork, &IContextNetwork::atcStationDisconnected,
this->getCContextOwnAircraft(), &CContextOwnAircraft::xCtxAtcStationDisconnected);
Q_ASSERT(c);
times.insert("Post setup, connects network", time.restart());
}

6
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -113,7 +113,7 @@ namespace BlackGui::Components
if (sGui)
{
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);
}
@@ -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
ui->tvp_AtcStationsOnline->changedAtcStationConnectionStatus(station, added);
ui->tvp_AtcStationsOnline->changedAtcStationConnectionStatus(station, false);
}
void CAtcStationComponent::getMetarAsEntered()

4
src/blackgui/components/atcstationcomponent.h
View File

@@ -87,8 +87,8 @@ namespace BlackGui
//! Set timestampd and call update
void forceUpdate();
//! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added);
//! ATC station disconnected
void atcStationDisconnected(const BlackMisc::Aviation::CAtcStation &station);
//! Get all METARs
void getMetarAsEntered();