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

Ref T294, display simulator internals correctly

Browse Source 
* view rows not selectable
* added settings to ISimulator
* ISimulator implements initSimulatorInternals() and sets default values
* also display plugin name
* XPlane using initSimulatorInternals()
This commit is contained in:
Klaus Basan
2018-07-28 00:19:06 +02:00
parent a05d11fff0
commit fbfbdedb65
10 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/simulator/fs9/simulatorfs9.cpp
View File

@@ -142,7 +142,7 @@ namespace BlackSimPlugin
{
m_fsuipc->connect(); // connect FSUIPC too
}
initSimulatorInternals();
this->initSimulatorInternals();
m_timerId = startTimer(50);
return true;
}

12
src/plugins/simulator/fscommon/simulatorfscommon.cpp
View File

@@ -45,17 +45,15 @@ namespace BlackSimPlugin
void CSimulatorFsCommon::initSimulatorInternals()
{
CSimulatorInternals s;
s.setSimulatorName(this->getSimulatorName());
s.setSimulatorVersion(this->getSimulatorVersion());
s.setValue("fscommon/fsuipc", boolToOnOff(m_useFsuipc));
CSimulatorPluginCommon::initSimulatorInternals();
m_simulatorInternals.setSimulatorVersion(this->getSimulatorVersion());
m_simulatorInternals.setValue("fscommon/fsuipc", boolToOnOff(m_useFsuipc));
if (m_fsuipc)
{
const QString v(m_fsuipc->getVersion());
if (!v.isEmpty()) { s.setValue("fscommon/fsuipcversion", v); }
s.setValue("fscommon/fsuipcconnect", boolToYesNo(m_fsuipc->isConnected()));
if (!v.isEmpty()) { m_simulatorInternals.setValue("fscommon/fsuipcversion", v); }
m_simulatorInternals.setValue("fscommon/fsuipcconnect", boolToYesNo(m_fsuipc->isConnected()));
}
m_simulatorInternals = s;
}
bool CSimulatorFsCommon::parseDetails(const CSimpleCommandParser &parser)

2
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -56,7 +56,7 @@ namespace BlackSimPlugin
QObject *parent = nullptr);
//! Init the internal objects
virtual void initSimulatorInternals();
virtual void initSimulatorInternals() override;
//! \name When swift DB data are read
//! @{

13
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -370,10 +370,10 @@ namespace BlackSimPlugin
this->initSimulatorInternals();
this->emitSimulatorCombinedStatus();
// Internals depends on sim data which take a while to be read
// Internals depends on simulator data which take a while to be read
// this is a trick and I re-init again after a while (which is not really expensive)
const QPointer<CSimulatorFsxCommon> myself(this);
QTimer::singleShot(1000, this, [myself]
QTimer::singleShot(2500, this, [myself]
{
if (myself.isNull()) { return; }
myself->initSimulatorInternals();
@@ -1833,13 +1833,8 @@ namespace BlackSimPlugin
void CSimulatorFsxCommon::initSimulatorInternals()
{
CSimulatorFsCommon::initSimulatorInternals();
CSimulatorInternals s = m_simulatorInternals;
const QString fsxPath = CFsCommonUtil::fsxDirFromRegistry(); // can be empty for remote FSX
if (!fsxPath.isEmpty()) { s.setSimulatorInstallationDirectory(fsxPath); }
s.setValue("fsx/simConnectCfgFilename", CSimConnectUtilities::getSwiftLocalSimConnectCfgFilename());
s.setValue("fsx/simConnectVersion", m_simConnectVersion);
m_simulatorInternals = s;
m_simulatorInternals.setValue("fsx/simConnectCfgFilename", CSimConnectUtilities::getSwiftLocalSimConnectCfgFilename());
m_simulatorInternals.setValue("fsx/simConnectVersion", m_simConnectVersion);
}
void CSimulatorFsxCommon::reset()

7
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -294,6 +294,7 @@ namespace BlackSimPlugin
m_trafficProxy = new CXSwiftBusTrafficProxy(m_dBusConnection, this);
m_weatherProxy = new CXSwiftBusWeatherProxy(m_dBusConnection, this);
bool ok = false;
if (m_serviceProxy->isValid() && m_trafficProxy->isValid() && m_weatherProxy->isValid() && m_trafficProxy->initialize())
{
emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(),
@@ -308,13 +309,15 @@ namespace BlackSimPlugin
m_trafficProxy->removeAllPlanes();
this->loadCslPackages();
this->emitSimulatorCombinedStatus();
return true;
ok = true;
}
else
{
this->disconnectFrom();
return false;
}
if (ok) { this->initSimulatorInternals(); }
return ok;
}
bool CSimulatorXPlane::disconnectFrom()