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

Ref T224, improved check of DB data availability in swift GUI

Browse Source 
* some renamings
* check for empty caches as well
* using fixed timestamp checks
* display info about loading objects
This commit is contained in:
Klaus Basan
2018-01-14 05:26:00 +01:00
parent d2389c15cc
commit 632e0207ce
5 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -7,6 +7,8 @@
* contained in the LICENSE file.
*/
#include "swiftguistd.h"
#include "ui_swiftguistd.h"
#include "blackconfig/buildconfig.h"
#include "blackcore/webdataservices.h"
#include "blackcore/context/contextnetwork.h"
@@ -32,9 +34,8 @@
#include "blackmisc/loghandler.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/logpattern.h"
#include "blackmisc/slot.h"
#include "blackmisc/statusmessage.h"
#include "swiftguistd.h"
#include "ui_swiftguistd.h"
#include <QAction>
#include <QHBoxLayout>
@@ -117,9 +118,7 @@ void SwiftGuiStd::init()
this->initGuiSignals();
// signal / slots contexts / timers
bool s = connect(sGui->getWebDataServices(), &CWebDataServices::sharedInfoObjectsRead, this, &SwiftGuiStd::sharedInfoObjectsLoaded, Qt::QueuedConnection);
Q_ASSERT(s);
s = connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &SwiftGuiStd::onConnectionStatusChanged, Qt::QueuedConnection);
bool s = connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &SwiftGuiStd::onConnectionStatusChanged, Qt::QueuedConnection);
Q_ASSERT(s);
s = connect(sGui->getIContextNetwork(), &IContextNetwork::kicked, this, &SwiftGuiStd::onKickedFromNetwork, Qt::QueuedConnection);
Q_ASSERT(s);
@@ -130,6 +129,11 @@ void SwiftGuiStd::init()
s = connect(&m_timerContextWatchdog, &QTimer::timeout, this, &SwiftGuiStd::handleTimerBasedUpdates);
Q_ASSERT(s);
Q_UNUSED(s);
// check if DB data have been loaded
// only check once, so data can be loaded and
connectOnce(sGui->getWebDataServices(), &CWebDataServices::sharedInfoObjectsRead, this, &SwiftGuiStd::checkDbDataLoaded, Qt::QueuedConnection);
// start timers, update timers will be started when network is connected
m_timerContextWatchdog.start(2500);
@@ -137,7 +141,7 @@ void SwiftGuiStd::init()
this->setContextAvailability();
// data
this->initialDataReads();
this->initialContextDataReads();
// start screen and complete menu
this->setMainPageToInfoArea();
@@ -156,8 +160,8 @@ void SwiftGuiStd::init()
emit sGui->startUpCompleted(true);
m_init = true;
QTimer::singleShot(2500, this, &SwiftGuiStd::verifyModelSet);
QTimer::singleShot(2500, this, &SwiftGuiStd::verifyModelSet);
if (!sGui->isNetworkAccessible())
{
CLogMessage(this).error("No network interface, software will not work properly");
@@ -240,7 +244,7 @@ void SwiftGuiStd::initGuiSignals()
connect(ui->comp_MainInfoArea, &CMainInfoAreaComponent::changedWholeInfoAreaFloating, this, &SwiftGuiStd::onChangedMainInfoAreaFloating);
}
void SwiftGuiStd::initialDataReads()
void SwiftGuiStd::initialContextDataReads()
{
this->setContextAvailability();
if (!m_coreAvailable)