mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 15:15:50 +08:00
refs #829, consolidated settings for simulator/messages
* move traits from blackcore to blackmisc * renamed CSimulatorSettings/Messages
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
#include "blackmisc/simulation/aircraftmodelinterfaces.h"
|
||||
#include "blackmisc/simulation/aircraftmodellist.h"
|
||||
#include "blackmisc/simulation/data/modelcaches.h"
|
||||
#include "blackmisc/simulation/simulationsettings.h"
|
||||
#include "blackmisc/simulation/simulatorsettings.h"
|
||||
#include "blackmisc/simulation/simulatorinfo.h"
|
||||
#include "blackmisc/statusmessage.h"
|
||||
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
|
||||
#include "registermetadatasimulation.h"
|
||||
#include "simulation.h"
|
||||
#include "blackmisc/simulation/simulationsettings.h"
|
||||
#include "blackmisc/simulation/simulatorsettings.h"
|
||||
#include "blackmisc/simulation/modelsettings.h"
|
||||
#include "blackmisc/valueobject.h"
|
||||
#include "blackmisc/variant.h"
|
||||
|
||||
@@ -41,8 +42,8 @@ namespace BlackMisc
|
||||
CSimulatorInternals::registerMetadata();
|
||||
CVPilotModelRule::registerMetadata();
|
||||
CVPilotModelRuleSet::registerMetadata();
|
||||
CSettings::registerMetadata();
|
||||
CSettingsSimulatorMessages::registerMetadata();
|
||||
CSimulatorSettings::registerMetadata();
|
||||
CSimulatorMessagesSettings::registerMetadata();
|
||||
}
|
||||
} // ns
|
||||
} // ns
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "simulationsettings.h"
|
||||
#include "simulatorsettings.h"
|
||||
#include "blackmisc/simulation/simulatedaircraft.h"
|
||||
#include "blackmisc/simulation/fscommon/fscommonutil.h"
|
||||
#include "blackmisc/simulation/xplane/xplaneutil.h"
|
||||
@@ -22,57 +22,57 @@ namespace BlackMisc
|
||||
{
|
||||
namespace Simulation
|
||||
{
|
||||
CSettings::CSettings()
|
||||
CSimulatorSettings::CSimulatorSettings()
|
||||
{ }
|
||||
|
||||
void CSettings::setSimulatorDirectory(const QString &simulatorDirectory)
|
||||
void CSimulatorSettings::setSimulatorDirectory(const QString &simulatorDirectory)
|
||||
{
|
||||
this->m_simulatorDirectory = simulatorDirectory.trimmed();
|
||||
}
|
||||
|
||||
const QString &CSettings::getSimulatorDirectory() const
|
||||
const QString &CSimulatorSettings::getSimulatorDirectory() const
|
||||
{
|
||||
return this->m_simulatorDirectory;
|
||||
}
|
||||
|
||||
void CSettings::setModelDirectories(const QStringList &modelDirectories)
|
||||
void CSimulatorSettings::setModelDirectories(const QStringList &modelDirectories)
|
||||
{
|
||||
this->m_modelDirectories = modelDirectories;
|
||||
}
|
||||
|
||||
void CSettings::setModelDirectory(const QString &modelDirectory)
|
||||
void CSimulatorSettings::setModelDirectory(const QString &modelDirectory)
|
||||
{
|
||||
this->m_modelDirectories = QStringList({ modelDirectory });
|
||||
}
|
||||
|
||||
const QStringList &CSettings::getModelDirectories() const
|
||||
const QStringList &CSimulatorSettings::getModelDirectories() const
|
||||
{
|
||||
return this->m_modelDirectories;
|
||||
}
|
||||
|
||||
void CSettings::setModelExcludeDirectories(const QStringList &excludeDirectories)
|
||||
void CSimulatorSettings::setModelExcludeDirectories(const QStringList &excludeDirectories)
|
||||
{
|
||||
this->m_excludeDirectoryPatterns = excludeDirectories;
|
||||
}
|
||||
|
||||
const QStringList &CSettings::getModelExcludeDirectoryPatterns() const
|
||||
const QStringList &CSimulatorSettings::getModelExcludeDirectoryPatterns() const
|
||||
{
|
||||
return m_excludeDirectoryPatterns;
|
||||
}
|
||||
|
||||
void CSettings::resetPaths()
|
||||
void CSimulatorSettings::resetPaths()
|
||||
{
|
||||
this->m_excludeDirectoryPatterns.clear();
|
||||
this->m_modelDirectories.clear();
|
||||
this->m_simulatorDirectory.clear();
|
||||
}
|
||||
|
||||
QString CSettings::convertToQString(bool i18n) const
|
||||
QString CSimulatorSettings::convertToQString(bool i18n) const
|
||||
{
|
||||
return convertToQString(", ", i18n);
|
||||
}
|
||||
|
||||
QString CSettings::convertToQString(const QString &separator, bool i18n) const
|
||||
QString CSimulatorSettings::convertToQString(const QString &separator, bool i18n) const
|
||||
{
|
||||
Q_UNUSED(i18n);
|
||||
QString s("model directories: ");
|
||||
@@ -83,10 +83,10 @@ namespace BlackMisc
|
||||
return s;
|
||||
}
|
||||
|
||||
CVariant CSettings::propertyByIndex(const CPropertyIndex &index) const
|
||||
CVariant CSimulatorSettings::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 IndexSimulatorDirectory:
|
||||
@@ -100,11 +100,10 @@ namespace BlackMisc
|
||||
}
|
||||
}
|
||||
|
||||
void CSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
|
||||
void CSimulatorSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
|
||||
{
|
||||
if (index.isMyself()) { (*this) = variant.to<CSettings>(); return; }
|
||||
|
||||
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
if (index.isMyself()) { (*this) = variant.to<CSimulatorSettings>(); return; }
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
case IndexSimulatorDirectory:
|
||||
@@ -127,7 +126,7 @@ namespace BlackMisc
|
||||
// void
|
||||
}
|
||||
|
||||
CSettings CMultiSimulatorSettings::getSettings(const CSimulatorInfo &simulator) const
|
||||
CSimulatorSettings CMultiSimulatorSettings::getSettings(const CSimulatorInfo &simulator) const
|
||||
{
|
||||
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
|
||||
switch (simulator.getSimulator())
|
||||
@@ -140,10 +139,10 @@ namespace BlackMisc
|
||||
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
|
||||
break;
|
||||
}
|
||||
return CSettings();
|
||||
return CSimulatorSettings();
|
||||
}
|
||||
|
||||
CStatusMessage CMultiSimulatorSettings::setSettings(const CSettings &settings, const CSimulatorInfo &simulator)
|
||||
CStatusMessage CMultiSimulatorSettings::setSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator)
|
||||
{
|
||||
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
|
||||
switch (simulator.getSimulator())
|
||||
@@ -159,7 +158,7 @@ namespace BlackMisc
|
||||
return CStatusMessage({ CLogCategory::settings() }, CStatusMessage::SeverityError, "wrong simulator");
|
||||
}
|
||||
|
||||
CStatusMessage CMultiSimulatorSettings::setAndSaveSettings(const CSettings &settings, const CSimulatorInfo &simulator)
|
||||
CStatusMessage CMultiSimulatorSettings::setAndSaveSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator)
|
||||
{
|
||||
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
|
||||
switch (simulator.getSimulator())
|
||||
@@ -193,7 +192,7 @@ namespace BlackMisc
|
||||
|
||||
QString CMultiSimulatorSettings::getSimulatorDirectoryOrDefault(const CSimulatorInfo &simulator) const
|
||||
{
|
||||
const CSettings s = this->getSettings(simulator);
|
||||
const CSimulatorSettings s = this->getSettings(simulator);
|
||||
if (s.getSimulatorDirectory().isEmpty())
|
||||
{
|
||||
return this->getDefaultSimulatorDirectory(simulator);
|
||||
@@ -219,7 +218,7 @@ namespace BlackMisc
|
||||
|
||||
QStringList CMultiSimulatorSettings::getModelDirectoriesOrDefault(const CSimulatorInfo &simulator) const
|
||||
{
|
||||
const CSettings s = this->getSettings(simulator);
|
||||
const CSimulatorSettings s = this->getSettings(simulator);
|
||||
if (s.getModelDirectories().isEmpty())
|
||||
{
|
||||
return this->getDefaultModelDirectories(simulator);
|
||||
@@ -253,7 +252,7 @@ namespace BlackMisc
|
||||
|
||||
QStringList CMultiSimulatorSettings::getModelExcludeDirectoryPatternsOrDefault(const CSimulatorInfo &simulator) const
|
||||
{
|
||||
const CSettings s = this->getSettings(simulator);
|
||||
const CSimulatorSettings s = this->getSettings(simulator);
|
||||
QStringList exclude(s.getModelExcludeDirectoryPatterns());
|
||||
if (!exclude.isEmpty()) { return exclude; }
|
||||
exclude = this->getDefaultModelExcludeDirectoryPatterns(simulator);
|
||||
@@ -278,80 +277,80 @@ namespace BlackMisc
|
||||
|
||||
void CMultiSimulatorSettings::resetToDefaults(const CSimulatorInfo &simulator)
|
||||
{
|
||||
CSettings s = this->getSettings(simulator);
|
||||
CSimulatorSettings s = this->getSettings(simulator);
|
||||
s.resetPaths();
|
||||
this->setAndSaveSettings(s, simulator);
|
||||
}
|
||||
|
||||
CSettingsSimulatorMessages::CSettingsSimulatorMessages()
|
||||
CSimulatorMessagesSettings::CSimulatorMessagesSettings()
|
||||
{
|
||||
// void
|
||||
}
|
||||
|
||||
void CSettingsSimulatorMessages::setTechnicalLogSeverity(CStatusMessage::StatusSeverity severity)
|
||||
void CSimulatorMessagesSettings::setTechnicalLogSeverity(CStatusMessage::StatusSeverity severity)
|
||||
{
|
||||
this->m_technicalLogLevel = static_cast<int>(severity);
|
||||
}
|
||||
|
||||
void CSettingsSimulatorMessages::disableTechnicalMessages()
|
||||
void CSimulatorMessagesSettings::disableTechnicalMessages()
|
||||
{
|
||||
this->m_technicalLogLevel = -1;
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedErrorsMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedErrorsMessages() const
|
||||
{
|
||||
if (this->m_technicalLogLevel < 0) { return false; }
|
||||
return (this->m_technicalLogLevel <= CStatusMessage::SeverityError);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedWarningMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedWarningMessages() const
|
||||
{
|
||||
if (this->m_technicalLogLevel < 0) { return false; }
|
||||
return (this->m_technicalLogLevel <= CStatusMessage::SeverityWarning);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedInfoMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedInfoMessages() const
|
||||
{
|
||||
if (this->m_technicalLogLevel < 0) { return false; }
|
||||
return (this->m_technicalLogLevel <= CStatusMessage::SeverityInfo);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedTechnicalMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedTechnicalMessages() const
|
||||
{
|
||||
return (this->m_technicalLogLevel >= 0);
|
||||
}
|
||||
|
||||
void CSettingsSimulatorMessages::setRelayedTextMessages(CSettingsSimulatorMessages::TextMessageType messageType)
|
||||
void CSimulatorMessagesSettings::setRelayedTextMessages(CSimulatorMessagesSettings::TextMessageType messageType)
|
||||
{
|
||||
this->m_messageType = static_cast<int>(messageType);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedSupervisorTextMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedSupervisorTextMessages() const
|
||||
{
|
||||
return this->getRelayedTextMessageTypes().testFlag(TextMessageSupervisor);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedPrivateTextMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedPrivateTextMessages() const
|
||||
{
|
||||
return this->getRelayedTextMessageTypes().testFlag(TextMessagePrivate);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedUnicomTextMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedUnicomTextMessages() const
|
||||
{
|
||||
return this->getRelayedTextMessageTypes().testFlag(TextMessagesUnicom);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedCom1TextMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedCom1TextMessages() const
|
||||
{
|
||||
return this->getRelayedTextMessageTypes().testFlag(TextMessagesCom1);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::isRelayedCom2TextMessages() const
|
||||
bool CSimulatorMessagesSettings::isRelayedCom2TextMessages() const
|
||||
{
|
||||
return this->getRelayedTextMessageTypes().testFlag(TextMessagesCom2);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::relayThisStatusMessage(const CStatusMessage &message) const
|
||||
bool CSimulatorMessagesSettings::relayThisStatusMessage(const CStatusMessage &message) const
|
||||
{
|
||||
if (message.isEmpty()) { return false; }
|
||||
if (!this->isGloballyEnabled()) { return false; }
|
||||
@@ -360,7 +359,7 @@ namespace BlackMisc
|
||||
return (s >= this->m_technicalLogLevel);
|
||||
}
|
||||
|
||||
bool CSettingsSimulatorMessages::relayThisTextMessage(const Network::CTextMessage &msg, const BlackMisc::Simulation::CSimulatedAircraft &aircraft) const
|
||||
bool CSimulatorMessagesSettings::relayThisTextMessage(const Network::CTextMessage &msg, const BlackMisc::Simulation::CSimulatedAircraft &aircraft) const
|
||||
{
|
||||
if (msg.isEmpty()) { return false; }
|
||||
if (!this->isGloballyEnabled()) { return false; }
|
||||
@@ -386,12 +385,12 @@ namespace BlackMisc
|
||||
return false;
|
||||
}
|
||||
|
||||
CSettingsSimulatorMessages::TextMessageType CSettingsSimulatorMessages::getRelayedTextMessageTypes() const
|
||||
CSimulatorMessagesSettings::TextMessageType CSimulatorMessagesSettings::getRelayedTextMessageTypes() const
|
||||
{
|
||||
return static_cast<CSettingsSimulatorMessages::TextMessageType>(this->m_messageType);
|
||||
return static_cast<CSimulatorMessagesSettings::TextMessageType>(this->m_messageType);
|
||||
}
|
||||
|
||||
QString CSettingsSimulatorMessages::convertToQString(bool i18n) const
|
||||
QString CSimulatorMessagesSettings::convertToQString(bool i18n) const
|
||||
{
|
||||
Q_UNUSED(i18n);
|
||||
QString s("Enabled %1, text messages: %2, severity: %3");
|
||||
@@ -407,7 +406,7 @@ namespace BlackMisc
|
||||
return s.arg(boolToOnOff(this->m_globallyEnabled)).arg(this->m_messageType).arg(severity);
|
||||
}
|
||||
|
||||
CVariant CSettingsSimulatorMessages::propertyByIndex(const CPropertyIndex &index) const
|
||||
CVariant CSimulatorMessagesSettings::propertyByIndex(const CPropertyIndex &index) const
|
||||
{
|
||||
if (index.isMyself()) { return CVariant::from(*this); }
|
||||
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
@@ -424,9 +423,9 @@ namespace BlackMisc
|
||||
}
|
||||
}
|
||||
|
||||
void CSettingsSimulatorMessages::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
|
||||
void CSimulatorMessagesSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
|
||||
{
|
||||
if (index.isMyself()) { (*this) = variant.to<CSettingsSimulatorMessages>(); return; }
|
||||
if (index.isMyself()) { (*this) = variant.to<CSimulatorMessagesSettings>(); return; }
|
||||
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
@@ -434,7 +433,7 @@ namespace BlackMisc
|
||||
this->setTechnicalLogSeverity(static_cast<CStatusMessage::StatusSeverity>(variant.toInt()));
|
||||
break;
|
||||
case IndexTextMessageRelay:
|
||||
this->setRelayedTextMessages(static_cast<CSettingsSimulatorMessages::TextMessageType>(variant.toInt()));
|
||||
this->setRelayedTextMessages(static_cast<CSimulatorMessagesSettings::TextMessageType>(variant.toInt()));
|
||||
break;
|
||||
case IndexGloballyEnabled:
|
||||
this->setGloballyEnabled(variant.toBool());
|
||||
@@ -9,11 +9,12 @@
|
||||
|
||||
//! \file
|
||||
|
||||
#ifndef BLACKMISC_SIMULATION_SETTINGS_H
|
||||
#define BLACKMISC_SIMULATION_SETTINGS_H
|
||||
#ifndef BLACKMISC_SIMULATION_SIMULATORSETTINGS_H
|
||||
#define BLACKMISC_SIMULATION_SIMULATORSETTINGS_H
|
||||
|
||||
#include "blackmisc/simulation/simulatorinfo.h"
|
||||
#include "blackmisc/network/textmessage.h"
|
||||
#include "blackmisc/weather/weatherscenario.h"
|
||||
#include "blackmisc/settingscache.h"
|
||||
#include "blackmisc/statusmessage.h"
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
@@ -30,8 +31,8 @@ namespace BlackMisc
|
||||
|
||||
//! Settings for simulator
|
||||
//! Driver independent part also used in loaders (such as directories)
|
||||
class BLACKMISC_EXPORT CSettings :
|
||||
public BlackMisc::CValueObject<CSettings>
|
||||
class BLACKMISC_EXPORT CSimulatorSettings :
|
||||
public BlackMisc::CValueObject<CSimulatorSettings>
|
||||
{
|
||||
public:
|
||||
//! Properties by index
|
||||
@@ -43,7 +44,7 @@ namespace BlackMisc
|
||||
};
|
||||
|
||||
//! Default constructor
|
||||
CSettings();
|
||||
CSimulatorSettings();
|
||||
|
||||
//! Set simulator directory
|
||||
void setSimulatorDirectory(const QString &simulatorDirectory);
|
||||
@@ -82,12 +83,12 @@ namespace BlackMisc
|
||||
void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const BlackMisc::CVariant &variant);
|
||||
|
||||
private:
|
||||
QString m_simulatorDirectory; //! Simulator directory
|
||||
QStringList m_modelDirectories; //!< Model directory
|
||||
QStringList m_excludeDirectoryPatterns; //!< Exclude model directory
|
||||
QString m_simulatorDirectory; //! Simulator directory
|
||||
QStringList m_modelDirectories; //!< Model directory
|
||||
QStringList m_excludeDirectoryPatterns; //!< Exclude model directory
|
||||
|
||||
BLACK_METACLASS(
|
||||
CSettings,
|
||||
CSimulatorSettings,
|
||||
BLACK_METAMEMBER(simulatorDirectory),
|
||||
BLACK_METAMEMBER(modelDirectories),
|
||||
BLACK_METAMEMBER(excludeDirectoryPatterns)
|
||||
@@ -95,28 +96,28 @@ namespace BlackMisc
|
||||
};
|
||||
|
||||
//! Trait for simulator settings
|
||||
struct TSimulatorFsx : public BlackMisc::TSettingTrait<CSettings>
|
||||
struct TSimulatorFsx : public BlackMisc::TSettingTrait<CSimulatorSettings>
|
||||
{
|
||||
//! Key in data cache
|
||||
static const char *key() { return "settingssimulatorfsx"; }
|
||||
};
|
||||
|
||||
//! Trait for simulator settings
|
||||
struct TSimulatorFs9 : public BlackMisc::TSettingTrait<CSettings>
|
||||
struct TSimulatorFs9 : public BlackMisc::TSettingTrait<CSimulatorSettings>
|
||||
{
|
||||
//! Key in data cache
|
||||
static const char *key() { return "settingssimulatorfs9"; }
|
||||
};
|
||||
|
||||
//! Trait for simulator settings
|
||||
struct TSimulatorP3D : public BlackMisc::TSettingTrait<CSettings>
|
||||
struct TSimulatorP3D : public BlackMisc::TSettingTrait<CSimulatorSettings>
|
||||
{
|
||||
//! Key in data cache
|
||||
static const char *key() { return "settingssimulatorp3d"; }
|
||||
};
|
||||
|
||||
//! Trait for simulator settings
|
||||
struct TSimulatorXP : public BlackMisc::TSettingTrait<CSettings>
|
||||
struct TSimulatorXP : public BlackMisc::TSettingTrait<CSimulatorSettings>
|
||||
{
|
||||
//! Key in data cache
|
||||
static const char *key() { return "settingssimulatorxplane"; }
|
||||
@@ -132,13 +133,13 @@ namespace BlackMisc
|
||||
CMultiSimulatorSettings(QObject *parent = nullptr);
|
||||
|
||||
//! Settings per simulator
|
||||
CSettings getSettings(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
|
||||
CSimulatorSettings getSettings(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
|
||||
|
||||
//! Set settings per simulator
|
||||
BlackMisc::CStatusMessage setSettings(const BlackMisc::Simulation::CSettings &settings, const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
||||
BlackMisc::CStatusMessage setSettings(const BlackMisc::Simulation::CSimulatorSettings &settings, const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
||||
|
||||
//! Set settings per simulator
|
||||
BlackMisc::CStatusMessage setAndSaveSettings(const BlackMisc::Simulation::CSettings &settings, const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
||||
BlackMisc::CStatusMessage setAndSaveSettings(const BlackMisc::Simulation::CSimulatorSettings &settings, const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
||||
|
||||
//! Set settings per simulator
|
||||
BlackMisc::CStatusMessage saveSettings(const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
||||
@@ -176,8 +177,8 @@ namespace BlackMisc
|
||||
|
||||
//! Settings regarding message handling.
|
||||
//! Driver independent part, related to network
|
||||
class BLACKMISC_EXPORT CSettingsSimulatorMessages :
|
||||
public BlackMisc::CValueObject<CSettingsSimulatorMessages>
|
||||
class BLACKMISC_EXPORT CSimulatorMessagesSettings :
|
||||
public BlackMisc::CValueObject<CSimulatorMessagesSettings>
|
||||
{
|
||||
public:
|
||||
//! Properties by index
|
||||
@@ -197,12 +198,12 @@ namespace BlackMisc
|
||||
TextMessagesCom2 = 1 << 2,
|
||||
TextMessagePrivate = 1 << 3,
|
||||
TextMessageSupervisor = 1 << 4,
|
||||
TextMessagesAll = TextMessagesUnicom | TextMessagesCom1 | TextMessagesCom2 | TextMessagePrivate
|
||||
TextMessagesAll = TextMessagesUnicom | TextMessagesCom1 | TextMessagesCom2 | TextMessagePrivate
|
||||
};
|
||||
Q_DECLARE_FLAGS(TextMessageType, TextMessageTypeFlag)
|
||||
|
||||
//! Default constructor
|
||||
CSettingsSimulatorMessages();
|
||||
CSimulatorMessagesSettings();
|
||||
|
||||
//! Log severity
|
||||
void setTechnicalLogSeverity(BlackMisc::CStatusMessage::StatusSeverity severity);
|
||||
@@ -229,7 +230,7 @@ namespace BlackMisc
|
||||
bool isRelayedTechnicalMessages() const;
|
||||
|
||||
//! Relay the following message types
|
||||
void setRelayedTextMessages(BlackMisc::Simulation::CSettingsSimulatorMessages::TextMessageType messageType);
|
||||
void setRelayedTextMessages(BlackMisc::Simulation::CSimulatorMessagesSettings::TextMessageType messageType);
|
||||
|
||||
//! Relay supervisor messages
|
||||
bool isRelayedSupervisorTextMessages() const;
|
||||
@@ -253,7 +254,7 @@ namespace BlackMisc
|
||||
bool relayThisStatusMessage(const BlackMisc::CStatusMessage &message) const;
|
||||
|
||||
//! Relayed text messages
|
||||
CSettingsSimulatorMessages::TextMessageType getRelayedTextMessageTypes() const;
|
||||
CSimulatorMessagesSettings::TextMessageType getRelayedTextMessageTypes() const;
|
||||
|
||||
//! \copydoc BlackMisc::Mixin::String::toQString
|
||||
QString convertToQString(bool i18n = false) const;
|
||||
@@ -270,29 +271,43 @@ namespace BlackMisc
|
||||
bool m_globallyEnabled = true; //!< messsage relay enabled to simulator
|
||||
|
||||
BLACK_METACLASS(
|
||||
CSettingsSimulatorMessages,
|
||||
CSimulatorMessagesSettings,
|
||||
BLACK_METAMEMBER(technicalLogLevel),
|
||||
BLACK_METAMEMBER(messageType)
|
||||
);
|
||||
};
|
||||
|
||||
//! Trait for simulator message settings
|
||||
struct TSimulatorMessages : public BlackMisc::TSettingTrait<CSettingsSimulatorMessages>
|
||||
struct TSimulatorMessages : public BlackMisc::TSettingTrait<CSimulatorMessagesSettings>
|
||||
{
|
||||
//! Key in data cache
|
||||
static const char *key() { return "settingssimulatormessages"; }
|
||||
};
|
||||
|
||||
//! Selected weather scenario
|
||||
struct TSelectedWeatherScenario : public BlackMisc::TSettingTrait<BlackMisc::Weather::CWeatherScenario>
|
||||
{
|
||||
//! \copydoc BlackMisc::TSettingTrait::key
|
||||
static const char *key() { return "simulator/selectedweatherscenario"; }
|
||||
|
||||
//! \copydoc BlackMisc::TSettingTrait::defaultValue
|
||||
static const BlackMisc::Weather::CWeatherScenario &defaultValue()
|
||||
{
|
||||
static const BlackMisc::Weather::CWeatherScenario scenario {};
|
||||
return scenario;
|
||||
}
|
||||
};
|
||||
} // ns
|
||||
} // ns
|
||||
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSettings)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSettings>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSettings>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSettingsSimulatorMessages)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSettingsSimulatorMessages>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSettingsSimulatorMessages>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSettingsSimulatorMessages::TextMessageTypeFlag)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSettingsSimulatorMessages::TextMessageType)
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackMisc::Simulation::CSettingsSimulatorMessages::TextMessageType)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorSettings)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSimulatorSettings>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSimulatorSettings>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorMessagesSettings)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSimulatorMessagesSettings>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSimulatorMessagesSettings>)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorMessagesSettings::TextMessageTypeFlag)
|
||||
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorMessagesSettings::TextMessageType)
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackMisc::Simulation::CSimulatorMessagesSettings::TextMessageType)
|
||||
|
||||
#endif // guard
|
||||
Reference in New Issue
Block a user