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

refs #395, GUI for simulator settings

Browse Source 
* improved formatting of aircraft views
* extended settings for render restrictions (such as max. aircraft, max range ...)
* connected new signal / slots in runtime
* Doxygen / formatting
This commit is contained in:
Klaus Basan
2015-05-06 02:50:45 +02:00
committed by Mathew Sutcliffe
parent bbd5ad2cbc
commit e7f65ba0b6
10 changed files with 245 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackcore/context_runtime.cpp
View File

@@ -26,17 +26,11 @@ using namespace BlackMisc::Aviation;
namespace BlackCore
{
/*
* Constructor
*/
CRuntime::CRuntime(const CRuntimeConfig &config, QObject *parent) : QObject(parent)
{
this->init(config);
}
/*
* Init runtime
*/
void CRuntime::init(const CRuntimeConfig &config)
{
if (m_init) { return; }
@@ -50,8 +44,7 @@ namespace BlackCore
// upfront reading of settings, as DBus server already relies on settings
QString dbusAddress;
// FIXME RW: We are allocating a full settings context in order to get the DBus address.
// I wonder if this can be done cleaner.
//! \todo Change when settings ready RW: We are allocating a full settings context in order to get the DBus address. I wonder if this can be done cleaner.
if (config.hasDBusAddress()) { dbusAddress = config.getDBusAddress(); } // bootstrap / explicit
if (config.hasLocalSettings())
{
@@ -171,7 +164,7 @@ namespace BlackCore
// local simulator?
if (this->m_contextSimulator && this->m_contextSimulator->isUsingImplementingObject())
{
// only connect if simulator runs locally, no round trips
// only connect if network runs locally, no round trips
if (this->m_contextNetwork && this->m_contextNetwork->isUsingImplementingObject())
{
c = connect(this->m_contextNetwork, &IContextNetwork::textMessagesReceived,
@@ -192,6 +185,9 @@ namespace BlackCore
c = connect(this->m_contextNetwork, &IContextNetwork::changedRemoteAircraftEnabled,
this->getCContextSimulator(), &CContextSimulator::ps_changedRemoteAircraftEnabled);
Q_ASSERT(c);
c = connect(this->getCContextSimulator(), &CContextSimulator::renderRestrictionsChanged,
this->getCContextNetwork(), &CContextNetwork::ps_simulatorRenderRestrictionsChanged);
Q_ASSERT(c);
}
// only if own aircraft runs locally
@@ -210,10 +206,6 @@ namespace BlackCore
if (this->m_contextSettings)
{
connect(this->m_contextSettings, &IContextSettings::changedSettings, this->m_contextSimulator, &IContextSimulator::settingsChanged);
// if (!this->m_contextSimulator->loadSimulatorPluginFromSettings())
// {
// CLogMessage(this).warning("No simulator plugin loaded");
// }
this->m_contextSimulator->listenForSimulatorFromSettings();
times.insert("Post setup, load sim. listener(s)", time.restart());
}