X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=2223abaf75d3346532d26f81c9a529d0e4b3ae41;hb=1c552f400ee967f7a489853578c4d8d4bd2edfbf;hp=733900d56c7caa64c79a32141ea0f68a982d821b;hpb=1f3033cb3e63de7cfe98dab537460443917fece3;p=pulseview.git diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index 733900d5..2223abaf 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; @@ -56,11 +61,33 @@ 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 + Q_PROPERTY(QString error_message READ get_error_message) public: enum ChannelType { @@ -86,6 +113,9 @@ public: DynamicPreset = 0 ///< Conversion uses calculated values }; + static const QColor AnalogSignalColors[8]; + static const QColor LogicSignalColors[10]; + private: static const int ColorBGAlpha; static const uint64_t ConversionBlockSize; @@ -98,9 +128,15 @@ public: public: /** * Returns the underlying SR channel. + * Generated channels don't have a SR channel. */ shared_ptr channel() const; + /** + * Returns whether this channel is generated or a channel associated with the device. + */ + bool is_generated() const; + /** * Returns enabled status of this channel. */ @@ -123,6 +159,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, @@ -131,16 +174,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. @@ -167,6 +226,11 @@ public: */ QColor bgcolor() const; + /** + * Returns the current error message text. + */ + virtual QString get_error_message() const; + /** * Sets the internal data object. */ @@ -187,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. @@ -284,37 +353,36 @@ public: #endif virtual void save_settings(QSettings &settings) const; - virtual void restore_settings(QSettings &settings); void start_conversion(bool delayed_start=false); +protected: + virtual void set_error_message(QString msg); + private: + void stop_conversion(); + bool conversion_is_a2l() const; uint8_t convert_a2l_threshold(float threshold, float value); 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 convert_single_segment_range(shared_ptr asegment, + shared_ptr lsegment, uint64_t start_sample, uint64_t end_sample); + void convert_single_segment(shared_ptr asegment, + shared_ptr lsegment); void conversion_thread_proc(); - void stop_conversion(); - 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 conversion_type_changed(const ConversionType t); void samples_cleared(); - void samples_added(uint64_t segment_id, uint64_t start_sample, uint64_t end_sample); @@ -323,9 +391,11 @@ Q_SIGNALS: private Q_SLOTS: void on_samples_cleared(); - void on_samples_added(shared_ptr segment, uint64_t start_sample, + void on_samples_added(SharedPtrToSegment segment, uint64_t start_sample, uint64_t end_sample); + void on_input_segment_completed(); + void on_min_max_changed(float min, float max); void on_capture_state_changed(int state); @@ -335,6 +405,7 @@ private Q_SLOTS: protected: shared_ptr channel_; ChannelType channel_type_; + SignalGroup* group_; shared_ptr data_; shared_ptr converted_data_; ConversionType conversion_type_; @@ -350,9 +421,14 @@ protected: QString internal_name_, name_; QColor color_, bgcolor_; + unsigned int index_; + + QString error_message_; }; } // namespace data } // namespace pv +Q_DECLARE_METATYPE(shared_ptr); + #endif // PULSEVIEW_PV_DATA_SIGNALBASE_HPP