Ref T339, simulator info message (version) for SUP supervisor

This commit is contained in:
Klaus Basan
2018-09-10 17:59:32 +02:00
parent 97cf9f4939
commit 27f2fe1b57
4 changed files with 47 additions and 3 deletions

View File

@@ -8,6 +8,7 @@
*/
#include "simulationenvironmentprovider.h"
#include <QStringBuilder>
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
@@ -210,6 +211,24 @@ namespace BlackMisc
return this->getSimulatorPluginInfo().getSimulatorInfo();
}
QString ISimulationEnvironmentProvider::getSimulatorNameAndVersion() const
{
QString n;
QString v;
{
QReadLocker l(&m_lockSimInfo);
n = m_simulatorName;
v = m_simulatorVersion;
}
if (!n.isEmpty() && !v.isEmpty()) { return n % QStringLiteral(" ") % v; }
if (!n.isEmpty()) { return n; }
const CSimulatorInfo simInfo = this->getSimulatorInfo();
if (!simInfo.isUnspecified()) { return simInfo.toQString(true); }
return "not available";
}
CAircraftModel ISimulationEnvironmentProvider::getDefaultModel() const
{
QReadLocker l(&m_lockModel);
@@ -407,6 +426,12 @@ namespace BlackMisc
return this->provider()->getSimulatorInfo();
}
QString CSimulationEnvironmentAware::getSimulatorNameAndVersion() const
{
if (!this->hasProvider()) { return "not avialbale"; }
return this->provider()->getSimulatorNameAndVersion();
}
CAircraftModel CSimulationEnvironmentAware::getDefaultModel() const
{
if (!this->hasProvider()) { return CAircraftModel(); }