X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=7d7a795e5f8648bf649fa46345d5a679a930c510;hb=4b018bf1eeed0f7b80120d41d7881673a2f29e61;hp=7375c1dbfb149b360962fee6f0a6e846752132fa;hpb=b5d20c6d003d853ad0828d15b365988519e73e88;p=pulseview.git diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index 7375c1db..7d7a795e 100644 --- a/pv/data/signalbase.hpp +++ b/pv/data/signalbase.hpp @@ -22,6 +22,7 @@ #define PULSEVIEW_PV_DATA_SIGNALBASE_HPP #include +#include #include #include #include @@ -35,8 +36,12 @@ #include +#include "segment.hpp" + using std::atomic; using std::condition_variable; +using std::deque; +using std::enable_shared_from_this; using std::map; using std::mutex; using std::pair; @@ -55,9 +60,31 @@ class AnalogSegment; class DecoderStack; class Logic; class LogicSegment; +class Segment; +class SignalBase; class SignalData; -class SignalBase : public QObject +class SignalGroup : public QObject +{ + Q_OBJECT + +public: + SignalGroup(const QString& name); + + void append_signal(shared_ptr signal); + void remove_signal(shared_ptr signal); + deque> signals() const; + void clear(); + + const QString name() const; + +private: + deque> signals_; + QString name_; +}; + + +class SignalBase : public QObject, public enable_shared_from_this { Q_OBJECT @@ -86,7 +113,7 @@ public: }; private: - static const int ColourBGAlpha; + static const int ColorBGAlpha; static const uint64_t ConversionBlockSize; static const uint32_t ConversionDelay; @@ -97,6 +124,7 @@ public: public: /** * Returns the underlying SR channel. + * Generated channels don't have a SR channel. */ shared_ptr channel() const; @@ -122,6 +150,13 @@ public: */ unsigned int index() const; + /** + * Sets the index number of this channel, i.e. a unique ID assigned by + * the device driver or the logic bit index (see below). + * Only use immediately after creating the signal and leave it untouched after. + */ + void set_index(unsigned int index); + /** * Returns which bit of a given sample for this signal represents the * signal itself. This is relevant for compound signals like logic, @@ -130,16 +165,32 @@ public: */ unsigned int logic_bit_index() const; + /** + * Sets the signal group this signal belongs to + */ + void set_group(SignalGroup* group); + + /** + * Returns the signal group this signal belongs to or nullptr if none + */ + SignalGroup* group() const; + /** * Gets the name of this signal. */ QString name() const; /** - * Gets the internal name of this signal, i.e. how the device calls it. + * Gets the internal name of this signal, i.e. how the device/generator calls it. */ QString internal_name() const; + /** + * Sets the internal name of this signal, i.e. how the device/generator calls it. + * Only use immediately after creating the signal and leave it untouched after. + */ + void set_internal_name(QString internal_name); + /** * Produces a string for this signal that can be used for display, * i.e. it contains one or both of the signal/internal names. @@ -152,25 +203,30 @@ public: virtual void set_name(QString name); /** - * Get the colour of the signal. + * Get the color of the signal. */ - QColor colour() const; + QColor color() const; /** - * Set the colour of the signal. + * Set the color of the signal. */ - void set_colour(QColor colour); + void set_color(QColor color); /** - * Get the background colour of the signal. + * Get the background color of the signal. */ - QColor bgcolour() const; + QColor bgcolor() const; /** * Sets the internal data object. */ void set_data(shared_ptr data); + /** + * Clears all sample data and removes all associated segments. + */ + void clear_sample_data(); + /** * Get the internal data as analog data object in case of analog type. */ @@ -187,6 +243,16 @@ public: */ bool segment_is_complete(uint32_t segment_id) const; + /** + * Determines whether this signal has any sample data at all. + */ + bool has_samples() const; + + /** + * Returns the sample rate for this signal. + */ + virtual double get_samplerate() const; + /** * Queries the kind of conversion performed on this channel. */ @@ -268,7 +334,6 @@ public: #endif virtual void save_settings(QSettings &settings) const; - virtual void restore_settings(QSettings &settings); void start_conversion(bool delayed_start=false); @@ -280,6 +345,8 @@ private: uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr, float value, uint8_t &state); + void convert_single_segment_range(AnalogSegment *asegment, + LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample); void convert_single_segment(pv::data::AnalogSegment *asegment, pv::data::LogicSegment *lsegment); void conversion_thread_proc(); @@ -291,13 +358,13 @@ Q_SIGNALS: void name_changed(const QString &name); - void colour_changed(const QColor &colour); + void color_changed(const QColor &color); void conversion_type_changed(const ConversionType t); void samples_cleared(); - void samples_added(QObject* segment, uint64_t start_sample, + void samples_added(uint64_t segment_id, uint64_t start_sample, uint64_t end_sample); void min_max_changed(float min, float max); @@ -305,7 +372,7 @@ Q_SIGNALS: private Q_SLOTS: void on_samples_cleared(); - void on_samples_added(QObject* segment, uint64_t start_sample, + void on_samples_added(SharedPtrToSegment segment, uint64_t start_sample, uint64_t end_sample); void on_min_max_changed(float min, float max); @@ -317,6 +384,7 @@ private Q_SLOTS: protected: shared_ptr channel_; ChannelType channel_type_; + SignalGroup* group_; shared_ptr data_; shared_ptr converted_data_; ConversionType conversion_type_; @@ -331,7 +399,8 @@ protected: QTimer delayed_conversion_starter_; QString internal_name_, name_; - QColor colour_, bgcolour_; + QColor color_, bgcolor_; + unsigned int index_; }; } // namespace data