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

refs #514, ATC stations filter by valid frequency

Browse Source
This commit is contained in:
Klaus Basan
2015-11-26 03:47:43 +01:00
parent d6733d49bb
commit a5da201701
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,11 @@ namespace BlackGui
// update // update
if (this->m_timestampOnlineStationsChanged > this->m_timestampLastReadOnlineStations) if (this->m_timestampOnlineStationsChanged > this->m_timestampLastReadOnlineStations)
{ {
this->ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(this->getIContextNetwork()->getAtcStationsOnline().stationsWithValidVoiceRoom()); this->ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(
// test: filter by frequency, see if this is better
// this->getIContextNetwork()->getAtcStationsOnline().stationsWithValidVoiceRoom()
this->getIContextNetwork()->getAtcStationsOnline().stationsWithValidFrequency()
);
this->m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc(); this->m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc();
this->m_timestampOnlineStationsChanged = this->m_timestampLastReadOnlineStations; this->m_timestampOnlineStationsChanged = this->m_timestampLastReadOnlineStations;

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

@@ -37,6 +37,11 @@ namespace BlackMisc
return this->findBy(&CAtcStation::hasValidVoiceRoom, true); return this->findBy(&CAtcStation::hasValidVoiceRoom, true);
} }
CAtcStationList CAtcStationList::stationsWithValidFrequency() const
{
return this->findBy(&CAtcStation::hasValidFrequency, true);
}
CUserList CAtcStationList::getControllers() const CUserList CAtcStationList::getControllers() const
{ {
return this->findBy(Predicates::MemberValid(&CAtcStation::getController)).transform(Predicates::MemberTransform(&CAtcStation::getController)); return this->findBy(Predicates::MemberValid(&CAtcStation::getController)).transform(Predicates::MemberTransform(&CAtcStation::getController));

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

@@ -47,9 +47,13 @@ namespace BlackMisc
CAtcStationList findIfComUnitTunedIn25KHz(const BlackMisc::Aviation::CComSystem &comUnit) const; CAtcStationList findIfComUnitTunedIn25KHz(const BlackMisc::Aviation::CComSystem &comUnit) const;
//! Find 0..n stations with valid voice room //! Find 0..n stations with valid voice room
//! \sa CAtcStation::hasValid //! \sa CAtcStation::hasValidVoiceRoom
CAtcStationList stationsWithValidVoiceRoom() const; CAtcStationList stationsWithValidVoiceRoom() const;
//! Find 0..n stations with valid COM frequency
//! \sa CAtcStation::hasValidFrequency
CAtcStationList stationsWithValidFrequency() const;
//! All controllers (with valid data) //! All controllers (with valid data)
BlackMisc::Network::CUserList getControllers() const; BlackMisc::Network::CUserList getControllers() const;