From 76b591bf06651c50582c733d469deccbe57cfe92 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Mon, 6 Feb 2023 00:26:09 +0100 Subject: [PATCH] Rename CAtcStation frequency related methods --- src/blackmisc/aviation/atcstation.cpp | 4 ++-- src/blackmisc/aviation/atcstation.h | 8 ++++---- src/blackmisc/aviation/atcstationlist.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index ee5ca1855..2d108002d 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -280,12 +280,12 @@ namespace BlackMisc::Aviation return true; } - bool CAtcStation::isComUnitTunedInChannelSpacing(const CComSystem &comUnit) const + bool CAtcStation::isComUnitTunedToFrequency(const CComSystem &comUnit) const { return comUnit.isActiveFrequencySameFrequency(this->getFrequency()); } - bool CAtcStation::isFrequencyWithinChannelSpacing(const CFrequency &frequency, CComSystem::ChannelSpacing spacing) const + bool CAtcStation::isAtcStationFrequency(const CFrequency &frequency) const { return CComSystem::isSameFrequency(frequency, this->getFrequency()); } diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index 3c9baf0c6..20c35f2bc 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -197,11 +197,11 @@ namespace BlackMisc::Aviation //! Booked now? bool isBookedNow() const; - //! Tuned in within channel spacing - bool isComUnitTunedInChannelSpacing(const Aviation::CComSystem &comUnit) const; + //! Is Com unit tuned to this stations frequency + bool isComUnitTunedToFrequency(const Aviation::CComSystem &comUnit) const; - //! Is frequency within channel spacing - bool isFrequencyWithinChannelSpacing(const PhysicalQuantities::CFrequency &frequency, CComSystem::ChannelSpacing spacing) const; + //! Is passed frequency the frequency of this station + bool isAtcStationFrequency(const PhysicalQuantities::CFrequency &frequency) const; //! When booked, 0 means now, //! negative values mean booking in past, diff --git a/src/blackmisc/aviation/atcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp index 939451792..563b16374 100644 --- a/src/blackmisc/aviation/atcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -33,7 +33,7 @@ namespace BlackMisc::Aviation { return this->findBy([&](const CAtcStation & atcStation) { - return atcStation.isComUnitTunedInChannelSpacing(comUnit); + return atcStation.isComUnitTunedToFrequency(comUnit); }); } @@ -41,7 +41,7 @@ namespace BlackMisc::Aviation { return this->containsBy([&](const CAtcStation & atcStation) { - return atcStation.isComUnitTunedInChannelSpacing(comUnit); + return atcStation.isComUnitTunedToFrequency(comUnit); }); } @@ -50,7 +50,7 @@ namespace BlackMisc::Aviation if (frequency.isNull()) { return CAtcStationList(); } return this->findBy([&](const CAtcStation & atcStation) { - return atcStation.isFrequencyWithinChannelSpacing(frequency, spacing); + return atcStation.isAtcStationFrequency(frequency); }); }