Doxygen and style

This commit is contained in:
Klaus Basan
2019-06-10 02:41:15 +02:00
committed by Mat Sutcliffe
parent b7fd1fa777
commit 33c3ee68f1
2 changed files with 21 additions and 22 deletions

View File

@@ -280,11 +280,11 @@ namespace BlackCore
// settings // settings
BlackMisc::CSettingReadOnly<Application::TEnabledSimulators> m_enabledSimulators { this, &CContextSimulator::changeEnabledSimulators }; BlackMisc::CSettingReadOnly<Application::TEnabledSimulators> m_enabledSimulators { this, &CContextSimulator::changeEnabledSimulators };
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TModelMatching> m_matchingSettings { this }; //!< settings BlackMisc::CSetting<BlackMisc::Simulation::Settings::TModelMatching> m_matchingSettings { this }; //!< matching settings (all simulators)
BlackMisc::CData<BlackMisc::Simulation::Data::TSimulatorLastSelection> m_modelSetSimulator { this }; //!< current simulator (used with radio buttons) BlackMisc::CData<BlackMisc::Simulation::Data::TSimulatorLastSelection> m_modelSetSimulator { this }; //!< current simulator used for model set
BlackMisc::Simulation::Settings::CMultiSimulatorSettings m_simulatorSettings { this }; //!< for directories of XPlane BlackMisc::Simulation::Settings::CMultiSimulatorSettings m_simulatorSettings { this }; //!< individual for simulator, for validation of models
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TInterpolationAndRenderingSetupGlobal> m_renderSettings { this }; //!< rendering/interpolation settings BlackMisc::CSetting<BlackMisc::Simulation::Settings::TInterpolationAndRenderingSetupGlobal> m_renderSettings { this }; //!< rendering/interpolation settings (all simulators)
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSimulatorMessages> m_messageSettings { this }; //!< settings for messages BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TSimulatorMessages> m_messageSettings { this }; //!< settings for messages (all simulators)
}; };
} // namespace } // namespace
} // namespace } // namespace

View File

@@ -11,11 +11,11 @@
#ifndef BLACKMISC_SIMULATION_SETTINGS_SWIFTPLUGINSETTINGS_H #ifndef BLACKMISC_SIMULATION_SETTINGS_SWIFTPLUGINSETTINGS_H
#define BLACKMISC_SIMULATION_SETTINGS_SWIFTPLUGINSETTINGS_H #define BLACKMISC_SIMULATION_SETTINGS_SWIFTPLUGINSETTINGS_H
#include "blackmisc/settingscache.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscexport.h"
namespace BlackMisc namespace BlackMisc
{ {
@@ -24,14 +24,13 @@ namespace BlackMisc
namespace Settings namespace Settings
{ {
//! Settings for models //! Settings for models
class BLACKMISC_EXPORT CSwiftPluginSettings : class BLACKMISC_EXPORT CSwiftPluginSettings : public BlackMisc::CValueObject<CSwiftPluginSettings>
public BlackMisc::CValueObject<CSwiftPluginSettings>
{ {
public: public:
//! Properties by index //! Properties by index
enum ColumnIndex enum ColumnIndex
{ {
IndexEmulatedSimulator = BlackMisc::CPropertyIndex::GlobalIndexCSwiftPluignSettings, IndexEmulatedSimulator = CPropertyIndex::GlobalIndexCSwiftPluignSettings,
IndexOwnModel, IndexOwnModel,
IndexDefaultModel, IndexDefaultModel,
IndexLoggingFunctionCalls IndexLoggingFunctionCalls
@@ -41,22 +40,22 @@ namespace BlackMisc
CSwiftPluginSettings(); CSwiftPluginSettings();
//! Emulated simualtor //! Emulated simualtor
BlackMisc::Simulation::CSimulatorInfo getEmulatedSimulator() const { return m_emulatedSimulator; } CSimulatorInfo getEmulatedSimulator() const { return m_emulatedSimulator; }
//! Emulated simualtor //! Emulated simualtor
void setEmulatedSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator); void setEmulatedSimulator(const CSimulatorInfo &simulator);
//! Get own model //! Get own model
const BlackMisc::Simulation::CAircraftModel &getOwnModel() const { return m_ownModel; } const CAircraftModel &getOwnModel() const { return m_ownModel; }
//! Set own model //! Set own model
void setOwnModel(const BlackMisc::Simulation::CAircraftModel &ownModel) { m_ownModel = ownModel; } void setOwnModel(const CAircraftModel &ownModel) { m_ownModel = ownModel; }
//! Get default model //! Get default model
const BlackMisc::Simulation::CAircraftModel &getDefaultModel() const { return m_defaultModel; } const CAircraftModel &getDefaultModel() const { return m_defaultModel; }
//! Set default model //! Set default model
void setDefaultModel(const BlackMisc::Simulation::CAircraftModel &defaultModel) { m_defaultModel = defaultModel; } void setDefaultModel(const CAircraftModel &defaultModel) { m_defaultModel = defaultModel; }
//! Log function calls? //! Log function calls?
bool isLoggingFunctionCalls() const { return m_logFunctionCalls; } bool isLoggingFunctionCalls() const { return m_logFunctionCalls; }
@@ -68,15 +67,15 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const; QString convertToQString(bool i18n = false) const;
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; BlackMisc::CVariant propertyByIndex(const CPropertyIndex &index) const;
//! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const BlackMisc::CVariant &variant); void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant);
private: private:
BlackMisc::Simulation::CSimulatorInfo m_emulatedSimulator { BlackMisc::Simulation::CSimulatorInfo::P3D }; // simulator with default value CSimulatorInfo m_emulatedSimulator { CSimulatorInfo::P3D }; // simulator with default value
BlackMisc::Simulation::CAircraftModel m_ownModel; CAircraftModel m_ownModel;
BlackMisc::Simulation::CAircraftModel m_defaultModel; CAircraftModel m_defaultModel;
bool m_logFunctionCalls = true; bool m_logFunctionCalls = true;
BLACK_METACLASS( BLACK_METACLASS(