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

Ref T118, formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-10-19 18:46:32 +02:00
parent c6d184cd3b
commit e920dc77b8
7 changed files with 78 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/simulation/aircraftmodelloader.h
View File

@@ -55,7 +55,7 @@ namespace BlackMisc
enum LoadModeFlag
{
NotSet = 0,
LoadDirectly = 1 << 0, //!< load syncronously (blocking), normally for testing
LoadDirectly = 1 << 0, //!< load synchronously (blocking), normally for testing
LoadInBackground = 1 << 1, //!< load in background, asyncronously
CacheFirst = 1 << 2, //!< always use cache (if it has data)
CacheSkipped = 1 << 3, //!< ignore cache

18
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -60,7 +60,7 @@ namespace BlackMisc
CAircraftCfgParser::~CAircraftCfgParser()
{
// that should be safe as long as the worker uses deleteLater (which it does)
if (this->m_parserWorker) { this->m_parserWorker->waitForFinished(); }
if (m_parserWorker) { m_parserWorker->waitForFinished(); }
}
void CAircraftCfgParser::startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory)
@@ -70,9 +70,9 @@ namespace BlackMisc
const CSimulatorInfo simulator = this->getSimulator();
const QString modelDirectory = CFileUtils::fixWindowsUncPath(
directory.isEmpty() ? this->m_settings.getFirstModelDirectoryOrDefault(simulator) : directory
directory.isEmpty() ? m_settings.getFirstModelDirectoryOrDefault(simulator) : directory
); // expect only one directory
const QStringList excludedDirectoryPatterns(this->m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
const QStringList excludedDirectoryPatterns(m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
if (mode.testFlag(LoadInBackground))
{
@@ -94,10 +94,10 @@ namespace BlackMisc
m_parserWorker->thenWithResult<LoaderResponse>(this, [this, simulator](const LoaderResponse & tuple)
{
const bool ok = std::get<3>(tuple);
this->m_loadingMessages = std::get<2>(tuple);
m_loadingMessages = std::get<2>(tuple);
if (ok)
{
this->m_parsedCfgEntriesList = std::get<0>(tuple);
m_parsedCfgEntriesList = std::get<0>(tuple);
const CAircraftModelList models(std::get<1>(tuple));
const bool hasData = !models.isEmpty();
if (hasData)
@@ -109,7 +109,7 @@ namespace BlackMisc
}
else
{
CStatusMessage status = this->m_loadingMessages.toSingleMessage();
CStatusMessage status = m_loadingMessages.toSingleMessage();
status.setSeverity(CStatusMessage::SeverityError);
emit this->loadingFinished(status, simulator, ParsedData);
}
@@ -119,9 +119,9 @@ namespace BlackMisc
{
bool ok;
CStatusMessageList msgs;
this->m_parsedCfgEntriesList = performParsing(modelDirectory, excludedDirectoryPatterns, msgs, &ok);
CAircraftModelList models(this->m_parsedCfgEntriesList.toAircraftModelList(simulator, true, msgs));
this->m_loadingMessages = msgs;
m_parsedCfgEntriesList = performParsing(modelDirectory, excludedDirectoryPatterns, msgs, &ok);
CAircraftModelList models(m_parsedCfgEntriesList.toAircraftModelList(simulator, true, msgs));
m_loadingMessages = msgs;
const bool hasData = !models.isEmpty();
if (hasData)
{

148
src/blackmisc/simulation/settings/simulatorsettings.cpp
View File

@@ -29,12 +29,12 @@ namespace BlackMisc
void CSimulatorSettings::setSimulatorDirectory(const QString &simulatorDirectory)
{
this->m_simulatorDirectory = simulatorDirectory.trimmed();
m_simulatorDirectory = simulatorDirectory.trimmed();
}
const QString &CSimulatorSettings::getSimulatorDirectory() const
{
return this->m_simulatorDirectory;
return m_simulatorDirectory;
}
bool CSimulatorSettings::hasSimulatorDirectory() const
@@ -44,22 +44,22 @@ namespace BlackMisc
void CSimulatorSettings::setModelDirectories(const QStringList &modelDirectories)
{
this->m_modelDirectories = modelDirectories;
m_modelDirectories = modelDirectories;
}
void CSimulatorSettings::setModelDirectory(const QString &modelDirectory)
{
this->m_modelDirectories = QStringList({ modelDirectory });
m_modelDirectories = QStringList({ modelDirectory });
}
const QStringList &CSimulatorSettings::getModelDirectories() const
{
return this->m_modelDirectories;
return m_modelDirectories;
}
void CSimulatorSettings::setModelExcludeDirectories(const QStringList &excludeDirectories)
{
this->m_excludeDirectoryPatterns = excludeDirectories;
m_excludeDirectoryPatterns = excludeDirectories;
}
const QStringList &CSimulatorSettings::getModelExcludeDirectoryPatterns() const
@@ -69,9 +69,9 @@ namespace BlackMisc
void CSimulatorSettings::resetPaths()
{
this->m_excludeDirectoryPatterns.clear();
this->m_modelDirectories.clear();
this->m_simulatorDirectory.clear();
m_excludeDirectoryPatterns.clear();
m_modelDirectories.clear();
m_simulatorDirectory.clear();
}
QString CSimulatorSettings::convertToQString(bool i18n) const
@@ -83,10 +83,10 @@ namespace BlackMisc
{
Q_UNUSED(i18n);
QString s("model directories: ");
s.append(this->m_modelDirectories.join(','));
s.append(m_modelDirectories.join(','));
s.append(separator);
s.append("exclude directories: ");
s.append(this->m_excludeDirectoryPatterns.join(','));
s.append(m_excludeDirectoryPatterns.join(','));
return s;
}
@@ -96,14 +96,10 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexSimulatorDirectory:
return CVariant::fromValue(this->m_simulatorDirectory);
case IndexModelDirectory:
return CVariant::fromValue(this->m_modelDirectories);
case IndexModelExcludeDirectoryPatterns:
return CVariant::fromValue(this->m_excludeDirectoryPatterns);
default:
return CValueObject::propertyByIndex(index);
case IndexSimulatorDirectory: return CVariant::fromValue(m_simulatorDirectory);
case IndexModelDirectory: return CVariant::fromValue(m_modelDirectories);
case IndexModelExcludeDirectoryPatterns: return CVariant::fromValue(m_excludeDirectoryPatterns);
default: return CValueObject::propertyByIndex(index);
}
}
@@ -113,18 +109,10 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexSimulatorDirectory:
this->setSimulatorDirectory(variant.toQString());
break;
case IndexModelDirectory:
this->setSimulatorDirectory(variant.toQString());
break;
case IndexModelExcludeDirectoryPatterns:
this->m_excludeDirectoryPatterns = variant.value<QStringList>();
break;
default:
CValueObject::setPropertyByIndex(index, variant);
break;
case IndexSimulatorDirectory: this->setSimulatorDirectory(variant.toQString()); break;
case IndexModelDirectory: this->setSimulatorDirectory(variant.toQString()); break;
case IndexModelExcludeDirectoryPatterns: m_excludeDirectoryPatterns = variant.value<QStringList>(); break;
default: CValueObject::setPropertyByIndex(index, variant); break;
}
}
@@ -138,10 +126,10 @@ namespace BlackMisc
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return this->m_simSettingsFs9.get();
case CSimulatorInfo::FSX: return this->m_simSettingsFsx.get();
case CSimulatorInfo::P3D: return this->m_simSettingsP3D.get();
case CSimulatorInfo::XPLANE: return this->m_simSettingsXP.get();
case CSimulatorInfo::FS9: return m_simSettingsFs9.get();
case CSimulatorInfo::FSX: return m_simSettingsFsx.get();
case CSimulatorInfo::P3D: return m_simSettingsP3D.get();
case CSimulatorInfo::XPLANE: return m_simSettingsXP.get();
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
break;
@@ -154,10 +142,10 @@ namespace BlackMisc
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return this->m_simSettingsFs9.set(settings);
case CSimulatorInfo::FSX: return this->m_simSettingsFsx.set(settings);
case CSimulatorInfo::P3D: return this->m_simSettingsP3D.set(settings);
case CSimulatorInfo::XPLANE: return this->m_simSettingsXP.set(settings);
case CSimulatorInfo::FS9: return m_simSettingsFs9.set(settings);
case CSimulatorInfo::FSX: return m_simSettingsFsx.set(settings);
case CSimulatorInfo::P3D: return m_simSettingsP3D.set(settings);
case CSimulatorInfo::XPLANE: return m_simSettingsXP.set(settings);
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
break;
@@ -170,10 +158,10 @@ namespace BlackMisc
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return this->m_simSettingsFs9.setAndSave(settings);
case CSimulatorInfo::FSX: return this->m_simSettingsFsx.setAndSave(settings);
case CSimulatorInfo::P3D: return this->m_simSettingsP3D.setAndSave(settings);
case CSimulatorInfo::XPLANE: return this->m_simSettingsXP.setAndSave(settings);
case CSimulatorInfo::FS9: return m_simSettingsFs9.setAndSave(settings);
case CSimulatorInfo::FSX: return m_simSettingsFsx.setAndSave(settings);
case CSimulatorInfo::P3D: return m_simSettingsP3D.setAndSave(settings);
case CSimulatorInfo::XPLANE: return m_simSettingsXP.setAndSave(settings);
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
break;
@@ -186,10 +174,10 @@ namespace BlackMisc
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return this->m_simSettingsFs9.save();
case CSimulatorInfo::FSX: return this->m_simSettingsFsx.save();
case CSimulatorInfo::P3D: return this->m_simSettingsP3D.save();
case CSimulatorInfo::XPLANE: return this->m_simSettingsXP.save();
case CSimulatorInfo::FS9: return m_simSettingsFs9.save();
case CSimulatorInfo::FSX: return m_simSettingsFsx.save();
case CSimulatorInfo::P3D: return m_simSettingsP3D.save();
case CSimulatorInfo::XPLANE: return m_simSettingsXP.save();
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
break;
@@ -296,40 +284,40 @@ namespace BlackMisc
void CSimulatorMessagesSettings::setTechnicalLogSeverity(CStatusMessage::StatusSeverity severity)
{
this->m_technicalLogLevel = static_cast<int>(severity);
m_technicalLogLevel = static_cast<int>(severity);
}
void CSimulatorMessagesSettings::disableTechnicalMessages()
{
this->m_technicalLogLevel = -1;
m_technicalLogLevel = -1;
}
bool CSimulatorMessagesSettings::isRelayedErrorsMessages() const
{
if (this->m_technicalLogLevel < 0) { return false; }
return (this->m_technicalLogLevel <= CStatusMessage::SeverityError);
if (m_technicalLogLevel < 0) { return false; }
return (m_technicalLogLevel <= CStatusMessage::SeverityError);
}
bool CSimulatorMessagesSettings::isRelayedWarningMessages() const
{
if (this->m_technicalLogLevel < 0) { return false; }
return (this->m_technicalLogLevel <= CStatusMessage::SeverityWarning);
if (m_technicalLogLevel < 0) { return false; }
return (m_technicalLogLevel <= CStatusMessage::SeverityWarning);
}
bool CSimulatorMessagesSettings::isRelayedInfoMessages() const
{
if (this->m_technicalLogLevel < 0) { return false; }
return (this->m_technicalLogLevel <= CStatusMessage::SeverityInfo);
if (m_technicalLogLevel < 0) { return false; }
return (m_technicalLogLevel <= CStatusMessage::SeverityInfo);
}
bool CSimulatorMessagesSettings::isRelayedTechnicalMessages() const
{
return (this->m_technicalLogLevel >= 0);
return (m_technicalLogLevel >= 0);
}
void CSimulatorMessagesSettings::setRelayedTextMessages(CSimulatorMessagesSettings::TextMessageType messageType)
{
this->m_messageType = static_cast<int>(messageType);
m_messageType = static_cast<int>(messageType);
}
bool CSimulatorMessagesSettings::isRelayedSupervisorTextMessages() const
@@ -363,16 +351,16 @@ namespace BlackMisc
if (!this->isGloballyEnabled()) { return false; }
if (!this->isRelayedTechnicalMessages()) { return false; }
int s = static_cast<int>(message.getSeverity());
return (s >= this->m_technicalLogLevel);
return (s >= m_technicalLogLevel);
}
bool CSimulatorMessagesSettings::relayThisTextMessage(const Network::CTextMessage &msg, const BlackMisc::Simulation::CSimulatedAircraft &aircraft) const
{
if (msg.isEmpty()) { return false; }
if (!this->isGloballyEnabled()) { return false; }
if (this->m_messageType == NoTextMessages) { return false; }
if (m_messageType == NoTextMessages) { return false; }
const TextMessageType mt = static_cast<TextMessageType>(this->m_messageType);
const TextMessageType mt = static_cast<TextMessageType>(m_messageType);
if (msg.isPrivateMessage() && mt.testFlag(TextMessagePrivate)) { return true; }
if (msg.isSupervisorMessage() && (mt.testFlag(TextMessagePrivate) || mt.testFlag(TextMessageSupervisor))) { return true; }
if (msg.isSendToUnicom() && mt.testFlag(TextMessagesUnicom)) { return true; }
@@ -394,13 +382,13 @@ namespace BlackMisc
CSimulatorMessagesSettings::TextMessageType CSimulatorMessagesSettings::getRelayedTextMessageTypes() const
{
return static_cast<CSimulatorMessagesSettings::TextMessageType>(this->m_messageType);
return static_cast<CSimulatorMessagesSettings::TextMessageType>(m_messageType);
}
QString CSimulatorMessagesSettings::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
QString s("Enabled %1, text messages: %2, severity: %3");
static const QString s("Enabled %1, text messages: %2, severity: %3");
QString severity;
if (this->isRelayedTechnicalMessages())
{
@@ -408,46 +396,34 @@ namespace BlackMisc
}
else
{
severity = CStatusMessage::severityToString(static_cast<CStatusMessage::StatusSeverity>(this->m_technicalLogLevel));
severity = CStatusMessage::severityToString(static_cast<CStatusMessage::StatusSeverity>(m_technicalLogLevel));
}
return s.arg(boolToOnOff(this->m_globallyEnabled)).arg(this->m_messageType).arg(severity);
return s.arg(boolToOnOff(m_globallyEnabled)).arg(m_messageType).arg(severity);
}
CVariant CSimulatorMessagesSettings::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexTechnicalLogSeverity:
return CVariant::fromValue(this->m_technicalLogLevel);
case IndexTextMessageRelay:
return CVariant::from(this->m_messageType);
case IndexGloballyEnabled:
return CVariant::from(this->m_globallyEnabled);
default:
return CValueObject::propertyByIndex(index);
case IndexTechnicalLogSeverity: return CVariant::fromValue(m_technicalLogLevel);
case IndexTextMessageRelay: return CVariant::from(m_messageType);
case IndexGloballyEnabled: return CVariant::from(m_globallyEnabled);
default: return CValueObject::propertyByIndex(index);
}
}
void CSimulatorMessagesSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{
if (index.isMyself()) { (*this) = variant.to<CSimulatorMessagesSettings>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexTechnicalLogSeverity:
this->setTechnicalLogSeverity(static_cast<CStatusMessage::StatusSeverity>(variant.toInt()));
break;
case IndexTextMessageRelay:
this->setRelayedTextMessages(static_cast<CSimulatorMessagesSettings::TextMessageType>(variant.toInt()));
break;
case IndexGloballyEnabled:
this->setGloballyEnabled(variant.toBool());
break;
default:
CValueObject::setPropertyByIndex(index, variant);
break;
case IndexTechnicalLogSeverity: this->setTechnicalLogSeverity(static_cast<CStatusMessage::StatusSeverity>(variant.toInt())); break;
case IndexTextMessageRelay: this->setRelayedTextMessages(static_cast<CSimulatorMessagesSettings::TextMessageType>(variant.toInt())); break;
case IndexGloballyEnabled: this->setGloballyEnabled(variant.toBool()); break;
default: CValueObject::setPropertyByIndex(index, variant); break;
}
}
} // ns

4
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -119,7 +119,7 @@ namespace BlackMisc
CAircraftModelLoaderXPlane::~CAircraftModelLoaderXPlane()
{
// that should be safe as long as the worker uses deleteLater (which it does)
if (this->m_parserWorker) { this->m_parserWorker->waitForFinished(); }
if (m_parserWorker) { m_parserWorker->waitForFinished(); }
}
void CAircraftModelLoaderXPlane::startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory)
@@ -127,7 +127,7 @@ namespace BlackMisc
//! \todo KB/MS 2017-09 not high prio, but still needed: according to meeting XP needs to support multiple directories
const CSimulatorInfo simulator = this->getSimulator();
const QString modelDirectory(!directory.isEmpty() ? directory : this->getFirstModelDirectoryOrDefault()); // directory
const QStringList excludedDirectoryPatterns(this->m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
const QStringList excludedDirectoryPatterns(m_settings.getModelExcludeDirectoryPatternsOrDefault(simulator)); // copy
if (modelDirectory.isEmpty())
{