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

Ref T192, formatting ATC component (no private slots)

Browse Source
This commit is contained in:
Klaus Basan
2017-11-19 18:52:37 +01:00
parent 9cb06c4d56
commit bb7f38face
2 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,35 +79,35 @@ namespace BlackGui
ui->tvp_AtcStationsOnlineTree->setHeaderHidden(true); ui->tvp_AtcStationsOnlineTree->setHeaderHidden(true);
// Signal / Slots // Signal / Slots
connect(ui->le_AtcStationsOnlineMetar, &QLineEdit::returnPressed, this, &CAtcStationComponent::ps_getMetarAsEntered); connect(ui->le_AtcStationsOnlineMetar, &QLineEdit::returnPressed, this, &CAtcStationComponent::getMetarAsEntered);
connect(ui->pb_AtcStationsLoadMetar, &QPushButton::clicked, this, &CAtcStationComponent::ps_getMetarAsEntered); connect(ui->pb_AtcStationsLoadMetar, &QPushButton::clicked, this, &CAtcStationComponent::getMetarAsEntered);
connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::ps_atcStationsTabChanged); // "local" tab changed (booked, online) connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::atcStationsTabChanged); // "local" tab changed (booked, online)
connect(ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::ps_onlineAtcStationSelected); connect(ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::onlineAtcStationSelected);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::ps_testCreateDummyOnlineAtcStations); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::testCreateDummyOnlineAtcStations);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::ps_requestOnlineStationsUpdate); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::requestOnlineStationsUpdate);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::ps_requestOnlineStationsUpdate); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::requestOnlineStationsUpdate);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::ps_onCountChanged); connect(ui->tvp_AtcStationsOnline, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::onCountChanged);
connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestComFrequency, this, &CAtcStationComponent::ps_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);
connect(ui->tvp_AtcStationsBooked, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::ps_reloadAtcStationsBooked); connect(ui->tvp_AtcStationsBooked, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::reloadAtcStationsBooked);
connect(ui->tvp_AtcStationsBooked, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::ps_reloadAtcStationsBooked); connect(ui->tvp_AtcStationsBooked, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::reloadAtcStationsBooked);
connect(ui->tvp_AtcStationsBooked, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::ps_onCountChanged); connect(ui->tvp_AtcStationsBooked, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::onCountChanged);
connect(ui->pb_AtcStationsAtisReload, &QPushButton::clicked, this, &CAtcStationComponent::ps_requestAtis); connect(ui->pb_AtcStationsAtisReload, &QPushButton::clicked, this, &CAtcStationComponent::requestAtis);
connect(&m_updateTimer, &QTimer::timeout, this, &CAtcStationComponent::update); connect(&m_updateTimer, &QTimer::timeout, this, &CAtcStationComponent::update);
// runtime based connects // runtime based connects
connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationsOnlineDigest, this, &CAtcStationComponent::ps_changedAtcStationsOnline); connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationsOnlineDigest, this, &CAtcStationComponent::changedAtcStationsOnline);
connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationsBookedDigest, this, &CAtcStationComponent::ps_changedAtcStationsBooked); connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationsBookedDigest, this, &CAtcStationComponent::changedAtcStationsBooked);
connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationOnlineConnectionStatus, this, &CAtcStationComponent::changedAtcStationOnlineConnectionStatus); connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationOnlineConnectionStatus, this, &CAtcStationComponent::changedAtcStationOnlineConnectionStatus);
connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CAtcStationComponent::ps_connectionStatusChanged); connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CAtcStationComponent::connectionStatusChanged);
// web readers // web readers
if (sGui->hasWebDataServices()) if (sGui->hasWebDataServices())
{ {
connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAirportsRead, this, &CAtcStationComponent::ps_airportsRead); connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAirportsRead, this, &CAtcStationComponent::airportsRead);
this->ps_airportsRead(); this->airportsRead();
} }
// init settings // init settings
@@ -130,7 +130,7 @@ namespace BlackGui
bool CAtcStationComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) bool CAtcStationComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget)
{ {
CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea(parentDockableWidget); CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea(parentDockableWidget);
bool c = connect(this->getParentInfoArea(), &CInfoArea::changedInfoAreaTabBarIndex, this, &CAtcStationComponent::ps_infoAreaTabBarChanged); bool c = connect(this->getParentInfoArea(), &CInfoArea::changedInfoAreaTabBarIndex, this, &CAtcStationComponent::infoAreaTabBarChanged);
Q_ASSERT_X(c, Q_FUNC_INFO, "failed connect"); Q_ASSERT_X(c, Q_FUNC_INFO, "failed connect");
Q_ASSERT_X(parentDockableWidget, Q_FUNC_INFO, "missing parent"); Q_ASSERT_X(parentDockableWidget, Q_FUNC_INFO, "missing parent");
return c && parentDockableWidget; return c && parentDockableWidget;
@@ -153,16 +153,16 @@ namespace BlackGui
} }
// bookings // bookings
if (this->m_timestampBookedStationsChanged > this->m_timestampLastReadBookedStations) if (m_timestampBookedStationsChanged > m_timestampLastReadBookedStations)
{ {
this->ps_reloadAtcStationsBooked(); this->reloadAtcStationsBooked();
} }
// online stations, only when connected // online stations, only when connected
if (sGui->getIContextNetwork()->isConnected()) if (sGui->getIContextNetwork()->isConnected())
{ {
// update // update
if (this->m_timestampOnlineStationsChanged > this->m_timestampLastReadOnlineStations) if (m_timestampOnlineStationsChanged > m_timestampLastReadOnlineStations)
{ {
const CAtcStationsSettings settings = m_settingsAtc.getThreadLocal(); const CAtcStationsSettings settings = m_settingsAtc.getThreadLocal();
CAtcStationList onlineStations = CAtcStationList onlineStations =
@@ -174,8 +174,8 @@ namespace BlackGui
} }
ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(onlineStations); ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(onlineStations);
this->m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc(); m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc();
this->m_timestampOnlineStationsChanged = this->m_timestampLastReadOnlineStations; m_timestampOnlineStationsChanged = m_timestampLastReadOnlineStations;
this->updateTreeView(); this->updateTreeView();
} }
} }
@@ -192,7 +192,7 @@ namespace BlackGui
ui->tvp_AtcStationsOnline->changedAtcStationConnectionStatus(station, added); ui->tvp_AtcStationsOnline->changedAtcStationConnectionStatus(station, added);
} }
void CAtcStationComponent::ps_getMetarAsEntered() void CAtcStationComponent::getMetarAsEntered()
{ {
this->getMetar(""); this->getMetar("");
} }
@@ -217,7 +217,7 @@ namespace BlackGui
ui->le_AtcStationsOnlineMetar->clear(); ui->le_AtcStationsOnlineMetar->clear();
} }
void CAtcStationComponent::ps_reloadAtcStationsBooked() void CAtcStationComponent::reloadAtcStationsBooked()
{ {
Q_ASSERT(ui->tvp_AtcStationsBooked); Q_ASSERT(ui->tvp_AtcStationsBooked);
Q_ASSERT(sGui->getIContextNetwork()); Q_ASSERT(sGui->getIContextNetwork());
@@ -232,18 +232,18 @@ namespace BlackGui
else else
{ {
ui->tvp_AtcStationsBooked->updateContainerMaybeAsync(sGui->getIContextNetwork()->getAtcStationsBooked()); ui->tvp_AtcStationsBooked->updateContainerMaybeAsync(sGui->getIContextNetwork()->getAtcStationsBooked());
this->m_timestampLastReadBookedStations = QDateTime::currentDateTimeUtc(); m_timestampLastReadBookedStations = QDateTime::currentDateTimeUtc();
} }
} }
void CAtcStationComponent::ps_changedAtcStationsOnline() void CAtcStationComponent::changedAtcStationsOnline()
{ {
// just update timestamp, data will be pulled by timer // just update timestamp, data will be pulled by timer
// the timestamp will tell if there are any newer data // the timestamp will tell if there are any newer data
this->m_timestampOnlineStationsChanged = QDateTime::currentDateTimeUtc(); m_timestampOnlineStationsChanged = QDateTime::currentDateTimeUtc();
} }
void CAtcStationComponent::ps_changedAtcStationsBooked() void CAtcStationComponent::changedAtcStationsBooked()
{ {
// a change can mean a complete change of the bookings, or // a change can mean a complete change of the bookings, or
// a single value is updated (e.g. online status) // a single value is updated (e.g. online status)
@@ -251,27 +251,27 @@ namespace BlackGui
// the timestamp will tell if there are any newer data // the timestamp will tell if there are any newer data
// unlike online stations, this can happen if we are not connected to a FSD server // unlike online stations, this can happen if we are not connected to a FSD server
this->m_timestampBookedStationsChanged = QDateTime::currentDateTimeUtc(); m_timestampBookedStationsChanged = QDateTime::currentDateTimeUtc();
if (this->m_updateTimer.isActive()) { return; } // update by timer if (m_updateTimer.isActive()) { return; } // update by timer
this->update(); this->update();
} }
void CAtcStationComponent::ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to) void CAtcStationComponent::connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
{ {
Q_UNUSED(from); Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to)) if (INetwork::isDisconnectedStatus(to))
{ {
ui->tvp_AtcStationsOnline->clear(); ui->tvp_AtcStationsOnline->clear();
this->updateTreeView(); this->updateTreeView();
this->m_updateTimer.start(); m_updateTimer.start();
} }
else if (INetwork::isConnectedStatus(to)) else if (INetwork::isConnectedStatus(to))
{ {
this->m_updateTimer.stop(); m_updateTimer.stop();
} }
} }
void CAtcStationComponent::ps_testCreateDummyOnlineAtcStations(int number) void CAtcStationComponent::testCreateDummyOnlineAtcStations(int number)
{ {
if (sGui->getIContextNetwork()) if (sGui->getIContextNetwork())
{ {
@@ -279,13 +279,13 @@ namespace BlackGui
} }
} }
void CAtcStationComponent::ps_requestOnlineStationsUpdate() void CAtcStationComponent::requestOnlineStationsUpdate()
{ {
this->m_timestampLastReadOnlineStations.setMSecsSinceEpoch(0); // mark as outdated m_timestampLastReadOnlineStations.setMSecsSinceEpoch(0); // mark as outdated
this->update(); this->update();
} }
void CAtcStationComponent::ps_infoAreaTabBarChanged(int index) void CAtcStationComponent::infoAreaTabBarChanged(int index)
{ {
// ignore in those cases // ignore in those cases
if (!this->isVisibleWidget()) { return; } if (!this->isVisibleWidget()) { return; }
@@ -296,7 +296,7 @@ namespace BlackGui
Q_UNUSED(index); Q_UNUSED(index);
} }
void CAtcStationComponent::ps_onCountChanged(int count, bool withFilter) void CAtcStationComponent::onCountChanged(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count);
Q_UNUSED(withFilter); Q_UNUSED(withFilter);
@@ -310,7 +310,7 @@ namespace BlackGui
this->tabBar()->setTabText(ib, b); this->tabBar()->setTabText(ib, b);
} }
void CAtcStationComponent::ps_setComFrequency(const PhysicalQuantities::CFrequency &frequency, CComSystem::ComUnit unit) void CAtcStationComponent::setComFrequency(const PhysicalQuantities::CFrequency &frequency, CComSystem::ComUnit unit)
{ {
if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return; } if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return; }
if (!CComSystem::isValidComFrequency(frequency)) { return; } if (!CComSystem::isValidComFrequency(frequency)) { return; }
@@ -319,12 +319,12 @@ namespace BlackGui
void CAtcStationComponent::settingsChanged() void CAtcStationComponent::settingsChanged()
{ {
const CViewUpdateSettings settings = this->m_settingsView.get(); const CViewUpdateSettings settings = m_settingsView.get();
const int ms = settings.getAtcUpdateTime().toMs(); const int ms = settings.getAtcUpdateTime().toMs();
this->m_updateTimer.setInterval(ms); m_updateTimer.setInterval(ms);
} }
void CAtcStationComponent::ps_airportsRead() void CAtcStationComponent::airportsRead()
{ {
this->initCompleters(); this->initCompleters();
} }
@@ -358,7 +358,7 @@ namespace BlackGui
} }
} }
void CAtcStationComponent::ps_onlineAtcStationSelected(QModelIndex index) void CAtcStationComponent::onlineAtcStationSelected(QModelIndex index)
{ {
ui->te_AtcStationsOnlineInfo->setText(""); // reset ui->te_AtcStationsOnlineInfo->setText(""); // reset
const CAtcStation stationClicked = ui->tvp_AtcStationsOnline->derivedModel()->at(index); const CAtcStation stationClicked = ui->tvp_AtcStationsOnline->derivedModel()->at(index);
@@ -376,18 +376,18 @@ namespace BlackGui
ui->te_AtcStationsOnlineInfo->setText(infoMessage); ui->te_AtcStationsOnlineInfo->setText(infoMessage);
} }
void CAtcStationComponent::ps_atcStationsTabChanged() void CAtcStationComponent::atcStationsTabChanged()
{ {
if (this->currentWidget() == ui->tb_AtcStationsBooked) if (this->currentWidget() == ui->tb_AtcStationsBooked)
{ {
if (ui->tvp_AtcStationsBooked->isEmpty()) if (ui->tvp_AtcStationsBooked->isEmpty())
{ {
this->ps_reloadAtcStationsBooked(); this->reloadAtcStationsBooked();
} }
} }
} }
void CAtcStationComponent::ps_requestAtis() void CAtcStationComponent::requestAtis()
{ {
if (!sGui->getIContextNetwork()->isConnected()) return; if (!sGui->getIContextNetwork()->isConnected()) return;
sGui->getIContextNetwork()->requestAtisUpdates(); sGui->getIContextNetwork()->requestAtisUpdates();

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

@@ -78,50 +78,49 @@ namespace BlackGui
//! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus //! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added); void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added);
private slots: private:
//! Get all METARs //! Get all METARs
void ps_getMetarAsEntered(); void getMetarAsEntered();
//! Request new ATIS //! Request new ATIS
void ps_requestAtis(); void requestAtis();
//! Online ATC station selected //! Online ATC station selected
void ps_onlineAtcStationSelected(QModelIndex index); void onlineAtcStationSelected(QModelIndex index);
//! Tab changed //! Tab changed
void ps_atcStationsTabChanged(); void atcStationsTabChanged();
//! Booked stations reloading //! Booked stations reloading
void ps_reloadAtcStationsBooked(); void reloadAtcStationsBooked();
//! Booked stations changed //! Booked stations changed
void ps_changedAtcStationsBooked(); void changedAtcStationsBooked();
//! Online stations changed //! Online stations changed
void ps_changedAtcStationsOnline(); void changedAtcStationsOnline();
//! Connection status has been changed //! Connection status has been changed
void ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to); void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Request dummy ATC online stations //! Request dummy ATC online stations
void ps_testCreateDummyOnlineAtcStations(int number); void testCreateDummyOnlineAtcStations(int number);
//! Request udpate //! Request udpate
void ps_requestOnlineStationsUpdate(); void requestOnlineStationsUpdate();
//! Info area tab bar has changed //! Info area tab bar has changed
void ps_infoAreaTabBarChanged(int index); void infoAreaTabBarChanged(int index);
//! Count has been changed //! Count has been changed
void ps_onCountChanged(int count, bool withFilter); void onCountChanged(int count, bool withFilter);
//! Set COM frequency //! Set COM frequency
void ps_setComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit unit); void setComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit unit);
//! Airports read from web readers //! Airports read from web readers
void ps_airportsRead(); void airportsRead();
private:
//! Build a tree view for ATC stations //! Build a tree view for ATC stations
void updateTreeView(); void updateTreeView();