flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused ChannelSpacing parameter

Browse Source
This commit is contained in:
Lars Toenning
2023-02-06 00:29:06 +01:00
parent 76b591bf06
commit 8747b91ea6
11 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -1351,10 +1351,8 @@ namespace BlackCore::Afv::Clients
if (sApp && sApp->getIContextNetwork()) if (sApp && sApp->getIContextNetwork())
{ {
// Get the callsign for this frequency and fuzzy compare with our alias station // Get the callsign for this frequency and fuzzy compare with our alias station
// !\todo KB 2019-10 replace by COM unit channel spacing
const CComSystem::ChannelSpacing spacing = CComSystem::ChannelSpacing25KHz;
const CFrequency f(static_cast<int>(roundedFrequencyHz), CFrequencyUnit::Hz()); const CFrequency f(static_cast<int>(roundedFrequencyHz), CFrequencyUnit::Hz());
const CAtcStationList matchingAtcStations = sApp->getIContextNetwork()->getOnlineStationsForFrequency(f, spacing); const CAtcStationList matchingAtcStations = sApp->getIContextNetwork()->getOnlineStationsForFrequency(f);
const CAtcStation closest = matchingAtcStations.findClosest(1, sApp->getIContextOwnAircraft()->getOwnAircraftSituation().getPosition()).frontOrDefault(); const CAtcStation closest = matchingAtcStations.findClosest(1, sApp->getIContextOwnAircraft()->getOwnAircraftSituation().getPosition()).frontOrDefault();
if (fuzzyMatchCallsign(it->name, closest.getCallsign().asString())) if (fuzzyMatchCallsign(it->name, closest.getCallsign().asString()))

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

@@ -211,7 +211,7 @@ namespace BlackCore::Context
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0; virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
//! Online stations for frequency //! Online stations for frequency
virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ChannelSpacing channelSpacing) const = 0; virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency) const = 0;
//! Online station for callsign? //! Online station for callsign?
virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const = 0; virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const = 0;

3
src/blackcore/context/contextnetworkempty.h
View File

@@ -75,10 +75,9 @@ namespace BlackCore::Context
} }
//! \copydoc IContextNetwork::getOnlineStationsForFrequency //! \copydoc IContextNetwork::getOnlineStationsForFrequency
virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ChannelSpacing channelSpacing) const override virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency) const override
{ {
Q_UNUSED(frequency) Q_UNUSED(frequency)
Q_UNUSED(channelSpacing)
logEmptyContextWarning(Q_FUNC_INFO); logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Aviation::CAtcStationList(); return BlackMisc::Aviation::CAtcStationList();
} }

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

@@ -1050,10 +1050,10 @@ namespace BlackCore::Context
return m_airspace->getAtcStationsOnline().findFirstByCallsign(callsign); return m_airspace->getAtcStationsOnline().findFirstByCallsign(callsign);
} }
CAtcStationList CContextNetwork::getOnlineStationsForFrequency(const CFrequency &frequency, CComSystem::ChannelSpacing channelSpacing) const CAtcStationList CContextNetwork::getOnlineStationsForFrequency(const CFrequency &frequency) const
{ {
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; }
return m_airspace->getAtcStationsOnline().findIfFrequencyIsWithinSpacing(frequency, channelSpacing); return m_airspace->getAtcStationsOnline().findIfFrequencyIsWithinSpacing(frequency);
} }
bool CContextNetwork::isOnlineStation(const CCallsign &callsign) const bool CContextNetwork::isOnlineStation(const CCallsign &callsign) const

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

@@ -257,7 +257,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override; virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override;
virtual BlackMisc::Aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; virtual BlackMisc::Aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override;
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ChannelSpacing channelSpacing) const override; virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency) const override;
virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const BlackMisc::Aviation::CCallsign &partnerCallsign, BlackMisc::Network::CLoginMode mode) override; virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const BlackMisc::Aviation::CCallsign &partnerCallsign, BlackMisc::Network::CLoginMode mode) override;
virtual BlackMisc::Network::CServer getConnectedServer() const override; virtual BlackMisc::Network::CServer getConnectedServer() const override;

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

@@ -145,9 +145,9 @@ namespace BlackCore::Context
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1String("getAircraftInRangeForCallsign"), callsign); return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1String("getAircraftInRangeForCallsign"), callsign);
} }
CAtcStationList CContextNetworkProxy::getOnlineStationsForFrequency(const CFrequency &frequency, CComSystem::ChannelSpacing channelSpacing) const CAtcStationList CContextNetworkProxy::getOnlineStationsForFrequency(const CFrequency &frequency) const
{ {
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getOnlineStationsForFrequency"), frequency, channelSpacing); return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getOnlineStationsForFrequency"), frequency);
} }
CAtcStation CContextNetworkProxy::getOnlineStationForCallsign(const CCallsign &callsign) const CAtcStation CContextNetworkProxy::getOnlineStationForCallsign(const CCallsign &callsign) const

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

@@ -83,7 +83,7 @@ namespace BlackCore
virtual int getAircraftInRangeCount() const override; virtual int getAircraftInRangeCount() const override;
virtual bool isAircraftInRange(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual bool isAircraftInRange(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ChannelSpacing channelSpacing) const override; virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency) const override;
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const BlackMisc::Aviation::CCallsign &partnerCallsign, BlackMisc::Network::CLoginMode mode) override; virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const BlackMisc::Aviation::CCallsign &partnerCallsign, BlackMisc::Network::CLoginMode mode) override;

2
src/blackcore/fsd/fsdclient.cpp
View File

@@ -630,7 +630,7 @@ namespace BlackCore::Fsd
for (const auto &message : radioMessages) for (const auto &message : radioMessages)
{ {
// Adjust to nearest frequency, in case of 5kHz difference // Adjust to nearest frequency, in case of 5kHz difference
const CAtcStationList stations = m_atcStations.findIfFrequencyIsWithinSpacing(message.getFrequency(), CComSystem::ChannelSpacing25KHz); const CAtcStationList stations = m_atcStations.findIfFrequencyIsWithinSpacing(message.getFrequency());
const CFrequency freq = stations.isEmpty() ? message.getFrequency() : stations.findClosest(1, getOwnAircraftPosition()).front().getFrequency(); const CFrequency freq = stations.isEmpty() ? message.getFrequency() : stations.findClosest(1, getOwnAircraftPosition()).front().getFrequency();
// I could send the same message to n frequencies in one step // I could send the same message to n frequencies in one step

5
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -448,9 +448,8 @@ namespace BlackGui::Components
CAtcStationList f2Stations; CAtcStationList f2Stations;
if (sGui && sGui->getIContextNetwork()) if (sGui && sGui->getIContextNetwork())
{ {
const CComSystem::ChannelSpacing spacing = CComSystem::ChannelSpacing8_33KHz; f1Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq1);
f1Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq1, spacing); f2Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq2);
f2Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq2, spacing);
} }
const QString f1n = QString::asprintf("%03.3f", freq1.valueRounded(CFrequencyUnit::MHz(), 3)); const QString f1n = QString::asprintf("%03.3f", freq1.valueRounded(CFrequencyUnit::MHz(), 3));

2
src/blackmisc/aviation/atcstationlist.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackMisc::Aviation
}); });
} }
CAtcStationList CAtcStationList::findIfFrequencyIsWithinSpacing(const CFrequency &frequency, CComSystem::ChannelSpacing spacing) CAtcStationList CAtcStationList::findIfFrequencyIsWithinSpacing(const CFrequency &frequency)
{ {
if (frequency.isNull()) { return CAtcStationList(); } if (frequency.isNull()) { return CAtcStationList(); }
return this->findBy([&](const CAtcStation & atcStation) return this->findBy([&](const CAtcStation & atcStation)

4
src/blackmisc/aviation/atcstationlist.h
View File

@@ -51,8 +51,8 @@ namespace BlackMisc::Aviation
//! Any stations tuned in frequency of COM unit (with channel spacing) //! Any stations tuned in frequency of COM unit (with channel spacing)
bool hasComUnitTunedInChannelSpacing(const CComSystem &comUnit) const; bool hasComUnitTunedInChannelSpacing(const CComSystem &comUnit) const;
//! Find 0..n stations within channel spacing //! Find 0..n stations with frequency (with 5 kHz spacing for .x20/.x25 and .x70/.x75)
CAtcStationList findIfFrequencyIsWithinSpacing(const PhysicalQuantities::CFrequency &frequency, CComSystem::ChannelSpacing spacing); CAtcStationList findIfFrequencyIsWithinSpacing(const PhysicalQuantities::CFrequency &frequency);
//! Update if message changed //! Update if message changed
bool updateIfMessageChanged(const CInformationMessage &im, const CCallsign &callsign, bool overrideWithNewer); bool updateIfMessageChanged(const CInformationMessage &im, const CCallsign &callsign, bool overrideWithNewer);