X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=90a13555fb41938db36eb6063aef096bc6da20ef;hp=4889d16acd4bc1ba75878cfe132e2d07b1202193;hb=bcaf033478ecf9a482f53b3dc973b7d2b9c4c52b;hpb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;ds=sidebyside diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index 4889d16a..90a13555 100644 --- a/pv/data/signalbase.hpp +++ b/pv/data/signalbase.hpp @@ -21,6 +21,8 @@ #ifndef PULSEVIEW_PV_DATA_SIGNALBASE_HPP #define PULSEVIEW_PV_DATA_SIGNALBASE_HPP +#include + #include #include #include @@ -55,12 +57,19 @@ public: MathChannel }; + enum ConversionType { + NoConversion = 0, + A2LConversionByTreshold = 1, + A2LConversionBySchmittTrigger = 2 + }; + private: static const int ColourBGAlpha; + static const uint64_t ConversionBlockSize; public: SignalBase(shared_ptr channel, ChannelType channel_type); - virtual ~SignalBase() {} + virtual ~SignalBase(); public: /** @@ -134,17 +143,26 @@ public: */ shared_ptr logic_data() const; + /** + * Changes the kind of conversion performed on this channel. + */ + void set_conversion_type(ConversionType t); + #ifdef ENABLE_DECODE bool is_decode_signal() const; +#endif - shared_ptr decoder_stack() const; + virtual void save_settings(QSettings &settings) const; - void set_decoder_stack(shared_ptr decoder_stack); -#endif + virtual void restore_settings(QSettings &settings); - void save_settings(QSettings &settings) const; +private: + 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 restore_settings(QSettings &settings); + void conversion_thread_proc(QObject* segment, uint64_t start_sample, + uint64_t end_sample); Q_SIGNALS: void enabled_changed(const bool &value); @@ -153,14 +171,29 @@ Q_SIGNALS: void colour_changed(const QColor &colour); -private: + void conversion_type_changed(const ConversionType t); + + void samples_cleared(); + + void samples_added(QObject* segment, uint64_t start_sample, + uint64_t end_sample); + +private Q_SLOTS: + void on_samples_cleared(); + + void on_samples_added(QObject* segment, uint64_t start_sample, + uint64_t end_sample); + + void on_capture_state_changed(int state); + +protected: shared_ptr channel_; ChannelType channel_type_; shared_ptr data_; + shared_ptr converted_data_; + int conversion_type_; -#ifdef ENABLE_DECODE - shared_ptr decoder_stack_; -#endif + std::thread conversion_thread_; QString internal_name_, name_; QColor colour_, bgcolour_;