X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=19f8143dc77e3499a92ecb0d17fb07fe411605be;hp=e50b9e968f36d72e711bfd9eb67c2d95c664a9bf;hb=HEAD;hpb=db51130df74d9188d98e1a3b8073d9d482d6fa60 diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index e50b9e96..19f8143d 100644 --- a/pv/data/signalbase.hpp +++ b/pv/data/signalbase.hpp @@ -87,7 +87,7 @@ private: class SignalBase : public QObject, public enable_shared_from_this { Q_OBJECT - Q_PROPERTY(QString error_message READ get_error_message) + Q_PROPERTY(QString error_message READ get_error_message NOTIFY error_message_changed) public: enum ChannelType { @@ -219,7 +219,7 @@ public: /** * Set the color of the signal. */ - void set_color(QColor color); + virtual void set_color(QColor color); /** * Get the background color of the signal. @@ -251,6 +251,11 @@ public: */ shared_ptr logic_data() const; + /** + * Get the primary internal data object, i.e. the data that was acquired from the device. + */ + shared_ptr data() const; + /** * Determines whether a given segment is complete (i.e. end-of-frame has * been seen). It only considers the original data, not the converted data. @@ -374,7 +379,7 @@ Q_SIGNALS: void enabled_changed(const bool &value); void name_changed(const QString &name); void color_changed(const QColor &color); - void error_message_changed(const QString &msg); + void error_message_changed(QString msg); void conversion_type_changed(const ConversionType t); void samples_cleared();