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

Improvements of swift GUI - pilot client

Browse Source 
* support for headers, allow to load files when caches are outdated (refs #787)
* display error when no model set is initialized
* removed some unused members
This commit is contained in:
Klaus Basan
2016-11-27 02:05:31 +01:00
parent 1b69a65b00
commit d057158e1d
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/swiftguistandard/swiftguistd.cpp
View File

@@ -10,7 +10,9 @@
#include "blackcore/context/contextapplication.h"
#include "blackcore/context/contextaudio.h"
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/network.h"
#include "blackcore/webdataservices.h"
#include "blackgui/components/infobarstatuscomponent.h"
#include "blackgui/components/logcomponent.h"
#include "blackgui/components/settingscomponent.h"
@@ -48,6 +50,7 @@ namespace BlackGui
namespace BlackMisc { class CIdentifiable; }
using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackMisc;
using namespace BlackGui;
using namespace BlackGui::Components;
@@ -57,6 +60,7 @@ using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Input;
using namespace BlackMisc::Simulation;
/*
* Constructor
@@ -153,7 +157,7 @@ void SwiftGuiStd::changeEvent(QEvent *event)
QAction *SwiftGuiStd::getWindowMinimizeAction(QObject *parent)
{
QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarMinButton), Qt::white, QSize(16, 16)));
const QIcon i(CIcons::changeIconBackgroundColor(this->style()->standardIcon(QStyle::SP_TitleBarMinButton), Qt::white, QSize(16, 16)));
QAction *a = new QAction(i, "Window minimized", parent);
connect(a, &QAction::triggered, this, &SwiftGuiStd::ps_showMinimized);
return a;
@@ -287,7 +291,6 @@ void SwiftGuiStd::ps_handleTimerBasedUpdates()
void SwiftGuiStd::setContextAvailability()
{
bool corePreviouslyAvailable = this->m_coreAvailable;
if (sGui && sGui->getIContextApplication()->isUsingImplementingObject())
{
this->m_coreAvailable = true;
@@ -295,9 +298,8 @@ void SwiftGuiStd::setContextAvailability()
else
{
// ping to check if core is still alive
this->m_coreAvailable =
sGui &&
this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
this->m_coreAvailable = sGui &&
this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
}
this->m_contextNetworkAvailable = this->m_coreAvailable || (sGui && sGui->getIContextNetwork()->isUsingImplementingObject());
this->m_contextAudioAvailable = this->m_coreAvailable || (sGui && sGui->getIContextAudio()->isUsingImplementingObject());
@@ -388,6 +390,35 @@ void SwiftGuiStd::ps_navigatorClosed()
this->showNormal();
}
void SwiftGuiStd::ps_verifyDataAvailability()
{
const CSimulatorInfo sims = sGui->getIContextSimulator()->simulatorsWithInitializedModelSet();
if (sims.isNoSimulator())
{
CLogMessage(this).error("No model set so far, you need at least one model set");
}
}
void SwiftGuiStd::ps_sharedFilesHeadersLoaded()
{
Q_ASSERT_X(sGui && sGui->hasWebDataServices(), Q_FUNC_INFO, "Missing web services");
const CEntityFlags::Entity newEntities = sGui->getWebDataServices()->getEntitiesWithNewerHeaderTimestamp(CEntityFlags::AllDbEntities);
if (newEntities == CEntityFlags::NoEntity) { return; }
CStatusMessage sm = CStatusMessage(this).info("New data for shared files:");
CStatusMessageList sms({sm});
const QSet<CEntityFlags::Entity> newSingleEntities = CEntityFlags::asSingleEntities(newEntities);
for (CEntityFlags::Entity newSingleEntity : newSingleEntities)
{
sm = CStatusMessage(this).info("Load data for '%1'?") << CEntityFlags::flagToString(newSingleEntity);
sms.push_back(sm);
}
auto lambda = [this, newEntities]()
{
sGui->getWebDataServices()->triggerLoadingDirectlyFromSharedFiles(newEntities, false);
};
ui->fr_CentralFrameInside->showOverlayMessagesWithConfirmation(sms, "Load data?", lambda);
}
void SwiftGuiStd::playNotifcationSound(CNotificationSounds::Notification notification) const
{
if (!this->m_contextAudioAvailable) { return; }