From 905af395992960a17e38c5be05f4f6af11cb0646 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 20 Aug 2016 12:40:15 -0700 Subject: [PATCH] Provide access to rawValue from Qml --- src/FactSystem/Fact.cc | 3 +++ src/FactSystem/Fact.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/FactSystem/Fact.cc b/src/FactSystem/Fact.cc index c0f58ccf8..02bc87863 100644 --- a/src/FactSystem/Fact.cc +++ b/src/FactSystem/Fact.cc @@ -77,6 +77,7 @@ void Fact::forceSetRawValue(const QVariant& value) _rawValue.setValue(typedValue); _sendValueChangedSignal(cookedValue()); emit _containerRawValueChanged(rawValue()); + emit rawValueChanged(_rawValue); } } else { qWarning() << "Meta data pointer missing"; @@ -94,6 +95,7 @@ void Fact::setRawValue(const QVariant& value) _rawValue.setValue(typedValue); _sendValueChangedSignal(cookedValue()); emit _containerRawValueChanged(rawValue()); + emit rawValueChanged(_rawValue); } } } else { @@ -136,6 +138,7 @@ void Fact::_containerSetRawValue(const QVariant& value) _rawValue = value; _sendValueChangedSignal(cookedValue()); emit vehicleUpdated(_rawValue); + emit rawValueChanged(_rawValue); } QString Fact::name(void) const diff --git a/src/FactSystem/Fact.h b/src/FactSystem/Fact.h index 9d903fc23..4d5078695 100644 --- a/src/FactSystem/Fact.h +++ b/src/FactSystem/Fact.h @@ -58,6 +58,7 @@ public: Q_PROPERTY(FactMetaData::ValueType_t type READ type CONSTANT) Q_PROPERTY(QString units READ cookedUnits CONSTANT) Q_PROPERTY(QVariant value READ cookedValue WRITE setCookedValue NOTIFY valueChanged) + Q_PROPERTY(QVariant rawValue READ rawValue WRITE setRawValue NOTIFY rawValueChanged) Q_PROPERTY(bool valueEqualsDefault READ valueEqualsDefault NOTIFY valueChanged) Q_PROPERTY(QString valueString READ cookedValueString NOTIFY valueChanged) Q_PROPERTY(QString enumOrValueString READ enumOrValueString NOTIFY valueChanged) @@ -145,6 +146,7 @@ signals: /// /// This signal is only meant for use by the QT property system. It should not be connected to by client code. void valueChanged(QVariant value); + void rawValueChanged(QVariant value); /// Signalled when the param write ack comes back from the vehicle void vehicleUpdated(QVariant value); -- 2.22.0