From 5cd0593e764915430a2fac0ae3a25e45f83e5149 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 24 Dec 2014 15:19:41 -0800 Subject: [PATCH] No inlines for easier debugging --- src/FactSystem/Fact.cc | 55 ++++++++++++++++++++++++++++++++++++++++++ src/FactSystem/Fact.h | 25 +++++++++++-------- 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/src/FactSystem/Fact.cc b/src/FactSystem/Fact.cc index 11cd7b201..57eed1c00 100644 --- a/src/FactSystem/Fact.cc +++ b/src/FactSystem/Fact.cc @@ -48,3 +48,58 @@ void Fact::_containerSetValue(const QVariant& value) _value = value; emit valueChanged(_value); } + +QString Fact::name(void) const +{ + return _name; +} + +QVariant Fact::value(void) const +{ + return _value; +} + +QString Fact::valueString(void) const +{ + return _value.toString(); +} + +QVariant Fact::defaultValue(void) +{ + return _metaData->defaultValue; +} + +FactMetaData::ValueType_t Fact::type(void) +{ + return _metaData->type; +} + +QString Fact::shortDescription(void) +{ + return _metaData->shortDescription; +} + +QString Fact::longDescription(void) +{ + return _metaData->longDescription; +} + +QString Fact::units(void) +{ + return _metaData->units; +} + +QVariant Fact::min(void) +{ + return _metaData->min; +} + +QVariant Fact::max(void) +{ + return _metaData->max; +} + +void Fact::setMetaData(FactMetaData* metaData) +{ + _metaData = metaData; +} diff --git a/src/FactSystem/Fact.h b/src/FactSystem/Fact.h index ebfedfc57..7d601a639 100644 --- a/src/FactSystem/Fact.h +++ b/src/FactSystem/Fact.h @@ -32,6 +32,7 @@ #include #include #include +#include /// @brief A Fact is used to hold a single value within the system. /// @@ -44,6 +45,7 @@ class Fact : public QObject Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged USER true) + Q_PROPERTY(QVariant valueString READ valueString NOTIFY valueChanged) Q_PROPERTY(QVariant defaultValue READ defaultValue CONSTANT) Q_PROPERTY(FactMetaData::ValueType_t type READ type CONSTANT) Q_PROPERTY(QString shortDescription READ shortDescription CONSTANT) @@ -60,37 +62,40 @@ public: // Property system methods /// Read accessor or name property - QString name(void) const { return _name; } + QString name(void) const; /// Read accessor for value property - QVariant value(void) const { return _value; } + QVariant value(void) const; + + /// Read accessor for valueString property + QString valueString(void) const; /// Write accessor for value property void setValue(const QVariant& value); /// Read accesor for defaultValue property - QVariant defaultValue(void) { return _metaData->defaultValue; } + QVariant defaultValue(void); /// Read accesor for type property - FactMetaData::ValueType_t type(void) { return _metaData->type; } + FactMetaData::ValueType_t type(void); /// Read accesor for shortDescription property - QString shortDescription(void) { return _metaData->shortDescription; } + QString shortDescription(void); /// Read accesor for longDescription property - QString longDescription(void) { return _metaData->longDescription; } + QString longDescription(void); /// Read accesor for units property - QString units(void) { return _metaData->units; } + QString units(void); /// Read accesor for min property - QVariant min(void) { return _metaData->min; } + QVariant min(void); /// Read accesor for max property - QVariant max(void) { return _metaData->max; } + QVariant max(void); /// Sets the meta data associated with the Fact. - void setMetaData(FactMetaData* metaData) { _metaData = metaData; } + void setMetaData(FactMetaData* metaData); void _containerSetValue(const QVariant& value); -- 2.22.0