X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=ee927aae27bf911c96f2c396a4a14fc42a22d33a;hb=69e950969e45ddbf516069c28f72f5696c53af5d;hp=6a3af14b3f0115c64dee8f1438fc21accfc37168;hpb=558ad6ceb934ab7406d286c1a4ae08da4aba1448;p=pulseview.git diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index 6a3af14b..ee927aae 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,11 +60,34 @@ 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 + Q_PROPERTY(QString error_message READ get_error_message) public: enum ChannelType { @@ -85,8 +113,11 @@ public: DynamicPreset = 0 ///< Conversion uses calculated values }; + static const QColor AnalogSignalColors[8]; + static const QColor LogicSignalColors[10]; + private: - static const int ColourBGAlpha; + static const int ColorBGAlpha; static const uint64_t ConversionBlockSize; static const uint32_t ConversionDelay; @@ -97,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. */ @@ -122,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, @@ -130,41 +174,73 @@ 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. + */ + QString display_name() const; + /** * Sets the name of the signal. */ 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; + + /** + * Returns the current error message text. + */ + virtual QString get_error_message() 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. */ @@ -181,6 +257,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. */ @@ -262,36 +348,37 @@ 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(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 colour_changed(const QColor &colour); - + 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(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); @@ -299,7 +386,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); @@ -311,6 +398,7 @@ private Q_SLOTS: protected: shared_ptr channel_; ChannelType channel_type_; + SignalGroup* group_; shared_ptr data_; shared_ptr converted_data_; ConversionType conversion_type_; @@ -325,10 +413,15 @@ protected: QTimer delayed_conversion_starter_; QString internal_name_, name_; - QColor colour_, bgcolour_; + QColor color_, bgcolor_; + unsigned int index_; + + QString error_message_; }; } // namespace data } // namespace pv +Q_DECLARE_METATYPE(shared_ptr); + #endif // PULSEVIEW_PV_DATA_SIGNALBASE_HPP