flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 03:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T534, show filtered counts and info if no ATC stations are shown

Browse Source
This commit is contained in:
Klaus Basan
2019-02-09 17:50:32 +01:00
committed by Mat Sutcliffe
parent 74727469f0
commit 4e2707f9d1
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,7 @@ namespace BlackGui
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::testCreateDummyOnlineAtcStations); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::testCreateDummyOnlineAtcStations);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::requestOnlineStationsUpdate); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::requestOnlineStationsUpdate);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::requestOnlineStationsUpdate); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::requestOnlineStationsUpdate);
// will be manually set
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::onCountChanged); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::onCountChanged);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestComFrequency, this, &CAtcStationComponent::setComFrequency); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestComFrequency, this, &CAtcStationComponent::setComFrequency);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestTextMessageWidget, this, &CAtcStationComponent::requestTextMessageWidget); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestTextMessageWidget, this, &CAtcStationComponent::requestTextMessageWidget);
@@ -216,17 +217,31 @@ namespace BlackGui
{ {
const CAtcStationsSettings settings = ui->comp_AtcStationsSettings->getSettings(); const CAtcStationsSettings settings = ui->comp_AtcStationsSettings->getSettings();
CAtcStationList onlineStations = sGui->getIContextNetwork()->getAtcStationsOnline(true); CAtcStationList onlineStations = sGui->getIContextNetwork()->getAtcStationsOnline(true);
const int allStationsCount = onlineStations.sizeInt();
int inRangeCount = -1;
if (settings.showOnlyWithValidFrequency()) { onlineStations = onlineStations.stationsWithValidFrequency(); } if (settings.showOnlyWithValidFrequency()) { onlineStations = onlineStations.stationsWithValidFrequency(); }
if (settings.showOnlyWithValidVoiceRoom()) { onlineStations = onlineStations.stationsWithValidVoiceRoom(); } if (settings.showOnlyWithValidVoiceRoom()) { onlineStations = onlineStations.stationsWithValidVoiceRoom(); }
if (settings.showOnlyInRange()) if (settings.showOnlyInRange())
{ {
onlineStations.removeIfOutsideRange(); onlineStations.removeIfOutsideRange();
inRangeCount = onlineStations.sizeInt();
} }
const int stationsCount = onlineStations.sizeInt();
ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(onlineStations); ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(onlineStations);
m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc(); m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc();
m_timestampOnlineStationsChanged = m_timestampLastReadOnlineStations; m_timestampOnlineStationsChanged = m_timestampLastReadOnlineStations;
this->updateTreeView(); this->updateTreeView();
this->setOnlineTabs(allStationsCount, stationsCount);
ui->comp_AtcStationsSettings->setCounts(allStationsCount, inRangeCount);
if (stationsCount < 1 && allStationsCount > 0)
{
const QString msg = QStringLiteral("All %1 ATC stations are filtered").arg(allStationsCount);
ui->tvp_AtcStationsOnline->showOverlayHTMLMessage(msg, 5000);
ui->tvp_AtcStationsOnlineTree->showOverlayHTMLMessage(msg, 5000);
}
} }
} }
else else
@@ -354,18 +369,22 @@ namespace BlackGui
{ {
Q_UNUSED(count); Q_UNUSED(count);
Q_UNUSED(withFilter); Q_UNUSED(withFilter);
const int ib = ui->tw_Atc->indexOf(ui->tb_AtcStationsBooked);
QString b = ui->tw_Atc->tabBar()->tabText(ib);
b = CGuiUtility::replaceTabCountValue(b, this->countBookedStations());
ui->tw_Atc->tabBar()->setTabText(ib, b);
}
void CAtcStationComponent::setOnlineTabs(int count, int filtered)
{
const int io = ui->tw_Atc->indexOf(ui->tb_AtcStationsOnline); const int io = ui->tw_Atc->indexOf(ui->tb_AtcStationsOnline);
const int it = ui->tw_Atc->indexOf(ui->tb_AtcStationsOnlineTree); const int it = ui->tw_Atc->indexOf(ui->tb_AtcStationsOnlineTree);
const int ib = ui->tw_Atc->indexOf(ui->tb_AtcStationsBooked); static const QString o = ui->tw_Atc->tabBar()->tabText(io);
QString o = ui->tw_Atc->tabBar()->tabText(io); static const QString t = ui->tw_Atc->tabBar()->tabText(it);
QString t = ui->tw_Atc->tabBar()->tabText(it); const bool isFiltered = filtered < count && filtered >= 0;
QString b = ui->tw_Atc->tabBar()->tabText(ib); const QString filteredInfo = isFiltered ? QStringLiteral(" (%1 of %2)").arg(filtered).arg(count) : QStringLiteral(" (%1)").arg(count);
o = CGuiUtility::replaceTabCountValue(o, this->countOnlineStations()); ui->tw_Atc->tabBar()->setTabText(io, o % filteredInfo);
t = CGuiUtility::replaceTabCountValue(t, this->countOnlineStations()); ui->tw_Atc->tabBar()->setTabText(it, t % filteredInfo);
b = CGuiUtility::replaceTabCountValue(b, this->countBookedStations());
ui->tw_Atc->tabBar()->setTabText(io, o);
ui->tw_Atc->tabBar()->setTabText(it, t);
ui->tw_Atc->tabBar()->setTabText(ib, b);
} }
void CAtcStationComponent::setComFrequency(const PhysicalQuantities::CFrequency &frequency, CComSystem::ComUnit unit) void CAtcStationComponent::setComFrequency(const PhysicalQuantities::CFrequency &frequency, CComSystem::ComUnit unit)

3
src/blackgui/components/atcstationcomponent.h
View File

@@ -135,6 +135,9 @@ namespace BlackGui
//! Count has been changed //! Count has been changed
void onCountChanged(int count, bool withFilter); void onCountChanged(int count, bool withFilter);
//! Online tab info
void setOnlineTabs(int count, int filtered);
//! Set COM frequency //! Set COM frequency
void setComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit unit); void setComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit unit);