diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index 71489ac6a..cde16c519 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -1351,10 +1351,8 @@ namespace BlackCore::Afv::Clients if (sApp && sApp->getIContextNetwork()) { // 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(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(); if (fuzzyMatchCallsign(it->name, closest.getCallsign().asString())) diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 2ffd57526..4ec253927 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -211,7 +211,7 @@ namespace BlackCore::Context virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0; //! 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? virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const = 0; diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index 47d66818a..718b25d77 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -75,10 +75,9 @@ namespace BlackCore::Context } //! \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(channelSpacing) logEmptyContextWarning(Q_FUNC_INFO); return BlackMisc::Aviation::CAtcStationList(); } diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 40aeb5460..63fcbcf88 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -1050,10 +1050,10 @@ namespace BlackCore::Context 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; } - return m_airspace->getAtcStationsOnline().findIfFrequencyIsWithinSpacing(frequency, channelSpacing); + return m_airspace->getAtcStationsOnline().findIfFrequencyIsWithinSpacing(frequency); } bool CContextNetwork::isOnlineStation(const CCallsign &callsign) const diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 65be3af76..fb468362c 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -257,7 +257,7 @@ namespace BlackCore virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) 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::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 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; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 1d9071ced..5f3bc9dc7 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -145,9 +145,9 @@ namespace BlackCore::Context return m_dBusInterface->callDBusRet(QLatin1String("getAircraftInRangeForCallsign"), callsign); } - CAtcStationList CContextNetworkProxy::getOnlineStationsForFrequency(const CFrequency &frequency, CComSystem::ChannelSpacing channelSpacing) const + CAtcStationList CContextNetworkProxy::getOnlineStationsForFrequency(const CFrequency &frequency) const { - return m_dBusInterface->callDBusRet(QLatin1String("getOnlineStationsForFrequency"), frequency, channelSpacing); + return m_dBusInterface->callDBusRet(QLatin1String("getOnlineStationsForFrequency"), frequency); } CAtcStation CContextNetworkProxy::getOnlineStationForCallsign(const CCallsign &callsign) const diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index 40d7d467e..54e92adac 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -83,7 +83,7 @@ namespace BlackCore virtual int getAircraftInRangeCount() 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::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 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; diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index b01497cbb..5bcede243 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -630,7 +630,7 @@ namespace BlackCore::Fsd for (const auto &message : radioMessages) { // 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(); // I could send the same message to n frequencies in one step diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index ca6ee6f4e..e0e310726 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -448,9 +448,8 @@ namespace BlackGui::Components CAtcStationList f2Stations; if (sGui && sGui->getIContextNetwork()) { - const CComSystem::ChannelSpacing spacing = CComSystem::ChannelSpacing8_33KHz; - f1Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq1, spacing); - f2Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq2, spacing); + f1Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq1); + f2Stations = sGui->getIContextNetwork()->getOnlineStationsForFrequency(freq2); } const QString f1n = QString::asprintf("%03.3f", freq1.valueRounded(CFrequencyUnit::MHz(), 3)); diff --git a/src/blackmisc/aviation/atcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp index 563b16374..b31aca0b0 100644 --- a/src/blackmisc/aviation/atcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -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(); } return this->findBy([&](const CAtcStation & atcStation) diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 5713b399b..89ad42c14 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -51,8 +51,8 @@ namespace BlackMisc::Aviation //! Any stations tuned in frequency of COM unit (with channel spacing) bool hasComUnitTunedInChannelSpacing(const CComSystem &comUnit) const; - //! Find 0..n stations within channel spacing - CAtcStationList findIfFrequencyIsWithinSpacing(const PhysicalQuantities::CFrequency &frequency, CComSystem::ChannelSpacing spacing); + //! Find 0..n stations with frequency (with 5 kHz spacing for .x20/.x25 and .x70/.x75) + CAtcStationList findIfFrequencyIsWithinSpacing(const PhysicalQuantities::CFrequency &frequency); //! Update if message changed bool updateIfMessageChanged(const CInformationMessage &im, const CCallsign &callsign, bool overrideWithNewer);