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

Shared URLs display only every 5secs

Browse Source
This commit is contained in:
Klaus Basan
2018-12-26 10:50:44 +01:00
committed by Mat Sutcliffe
parent b6844e4a44
commit 9d2da4524a
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/blackgui/components/dbloadoverviewcomponent.cpp
View File

@@ -155,8 +155,6 @@ namespace BlackGui
{ {
if (!sGui) { return; } if (!sGui) { return; }
if (!sGui->hasWebDataServices()) { return; } if (!sGui->hasWebDataServices()) { return; }
if (m_setValuesInProgress) { return; }
m_setValuesInProgress = true; // avoid processEvent (canConnect) calling this again before done
ui->le_AircraftIcaoCacheCount->setText(cacheCountForEntity(CEntityFlags::AircraftIcaoEntity)); ui->le_AircraftIcaoCacheCount->setText(cacheCountForEntity(CEntityFlags::AircraftIcaoEntity));
ui->le_AirlinesIcaoCacheCount->setText(cacheCountForEntity(CEntityFlags::AirlineIcaoEntity)); ui->le_AirlinesIcaoCacheCount->setText(cacheCountForEntity(CEntityFlags::AirlineIcaoEntity));
@@ -207,15 +205,26 @@ namespace BlackGui
ui->le_DistributorsSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::DistributorEntity)); ui->le_DistributorsSharedFileTs->setText(sharedFileTimestampForEntity(CEntityFlags::DistributorEntity));
// DB URL // DB URL
static const QString imgOk(":/diagona/icons/diagona/icons/tick.png");
static const QString imgFailed(":/diagona/icons/diagona/icons/cross-script.png");
const QString dbUrlHtml("<img src=\"%1\">&nbsp;&nbsp;<a href=\"%2\">%3</a>"); const QString dbUrlHtml("<img src=\"%1\">&nbsp;&nbsp;<a href=\"%2\">%3</a>");
const QString url = sGui->getGlobalSetup().getDbHomePageUrl().getFullUrl(); const QString url = sGui->getGlobalSetup().getDbHomePageUrl().getFullUrl();
bool canConnect = sGui->isSwiftDbAccessible(); bool canConnect = sGui->isSwiftDbAccessible();
ui->lbl_DatabaseUrl->setText(dbUrlHtml.arg(canConnect ? imgOk : imgFailed, url, url)); ui->lbl_DatabaseUrl->setText(dbUrlHtml.arg(canConnect ? m_imgOk : m_imgFailed, url, url));
ui->lbl_DatabaseUrl->setToolTip(url); ui->lbl_DatabaseUrl->setToolTip(url);
// Shared URLs // Shared URLs
this->setSharedUrlValues();
// Indicator
this->hideLoading();
}
void CDbLoadOverviewComponent::setSharedUrlValues()
{
if (m_sharedValueCheckInProgress) { return; }
if ((QDateTime::currentMSecsSinceEpoch() - m_sharedLastCheck) < 5000) { return; } // do not check too often
m_sharedValueCheckInProgress = true; // avoid processEvent (canConnect) calling this again before done
const CUrlList sharedUrls(sGui->getGlobalSetup().getSwiftSharedUrls()); const CUrlList sharedUrls(sGui->getGlobalSetup().getSwiftSharedUrls());
const QString valueHtml("<img src=\"%1\">&nbsp;%2"); const QString valueHtml("<img src=\"%1\">&nbsp;%2");
const QString urlLinkHtml("<a href=\"%1\">%2</a>"); const QString urlLinkHtml("<a href=\"%1\">%2</a>");
@@ -226,12 +235,12 @@ namespace BlackGui
if (!sGui || sGui->isShuttingDown()) if (!sGui || sGui->isShuttingDown())
{ {
// shutdown during connect test // shutdown during connect test
m_setValuesInProgress = false; m_sharedValueCheckInProgress = false;
return; return;
} }
canConnect = CNetworkUtils::canConnect(sharedUrl); const bool canConnect = CNetworkUtils::canConnect(sharedUrl);
values.push_back( values.push_back(
valueHtml.arg(canConnect ? imgOk : imgFailed, urlLinkHtml.arg(sharedUrl.getFullUrl(), sharedUrl.getHost())) valueHtml.arg(canConnect ? m_imgOk : m_imgFailed, urlLinkHtml.arg(sharedUrl.getFullUrl(), sharedUrl.getHost()))
); );
} }
@@ -243,9 +252,8 @@ namespace BlackGui
currentlyUsedSharedUrl.isEmpty() ? "No shared URL" : "currently used: " + currentlyUsedSharedUrl currentlyUsedSharedUrl.isEmpty() ? "No shared URL" : "currently used: " + currentlyUsedSharedUrl
); );
// Indicator m_sharedLastCheck = QDateTime::currentMSecsSinceEpoch();
this->hideLoading(); m_sharedValueCheckInProgress = false;
m_setValuesInProgress = false;
} }
bool CDbLoadOverviewComponent::isInitialized() const bool CDbLoadOverviewComponent::isInitialized() const

8
src/blackgui/components/dbloadoverviewcomponent.h
View File

@@ -70,7 +70,10 @@ namespace BlackGui
private: private:
QScopedPointer<Ui::CDbLoadOverviewComponent> ui; QScopedPointer<Ui::CDbLoadOverviewComponent> ui;
BlackMisc::CDigestSignal m_dsTriggerGuiUpdate { this, &CDbLoadOverviewComponent::setGuiValues, 2500, 5 }; BlackMisc::CDigestSignal m_dsTriggerGuiUpdate { this, &CDbLoadOverviewComponent::setGuiValues, 2500, 5 };
bool m_setValuesInProgress = false; //!< setting values in progress, needed because of CNetworkUtils::canConnect check (processing events) qint64 m_sharedLastCheck = -1; //!< when shared URLs were last checked
bool m_sharedValueCheckInProgress = false; //!< setting values in progress, needed because of CNetworkUtils::canConnect check (processing events)
const QString m_imgOk = ":/diagona/icons/diagona/icons/tick.png";
const QString m_imgFailed = ":/diagona/icons/diagona/icons/cross-script.png";
//! Trigger loading from DB //! Trigger loading from DB
void triggerLoadingFromDb(BlackMisc::Network::CEntityFlags::Entity entities); void triggerLoadingFromDb(BlackMisc::Network::CEntityFlags::Entity entities);
@@ -90,6 +93,9 @@ namespace BlackGui
//! Init the value panel //! Init the value panel
void setGuiValues(); void setGuiValues();
//! Shared URL values
void setSharedUrlValues();
//! Data have been loaded //! Data have been loaded
void dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number); void dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number);