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

Rename CAtcStation frequency related methods

Browse Source
This commit is contained in:
Lars Toenning
2023-02-06 00:26:09 +01:00
parent 7fdb1035d1
commit 76b591bf06
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/aviation/atcstation.cpp
View File

@@ -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());
}

8
src/blackmisc/aviation/atcstation.h
View File

@@ -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,

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

@@ -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);
});
}