X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;fp=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=2c4337478135fdc40d63c82c63316a59617f188e;hp=7b1a20134acaccd7ce4adec6462d11a02c11ffcb;hb=02078aa15a4747b8ab7a91d54e2e141c3acb5628;hpb=8997f62a4f87c822578aa5d835e1dd8109c6f5eb diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp index 7b1a2013..2c433747 100644 --- a/pv/data/decode/decoder.hpp +++ b/pv/data/decode/decoder.hpp @@ -20,6 +20,7 @@ #ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_HPP #define PULSEVIEW_PV_DATA_DECODE_DECODER_HPP +#include #include #include #include @@ -27,9 +28,12 @@ #include +#include + #include #include +using std::deque; using std::map; using std::string; using std::vector; @@ -50,13 +54,27 @@ namespace decode { class Decoder; -struct AnnotationClass +class AnnotationClass: public QObject { + Q_OBJECT + +public: + AnnotationClass(size_t _id, char* _name, char* _description, Row* _row); + + bool visible() const; + void set_visible(bool visible); + +Q_SIGNALS: + void visibility_changed(); + +public: size_t id; char* name; char* description; Row* row; - bool visible; + +private: + bool visible_; }; struct DecodeChannel @@ -79,8 +97,10 @@ struct DecodeBinaryClassInfo }; -class Decoder +class Decoder : public QObject { + Q_OBJECT + public: Decoder(const srd_decoder *const dec, uint8_t stack_level); @@ -119,6 +139,13 @@ public: uint32_t get_binary_class_count() const; const DecodeBinaryClassInfo* get_binary_class(uint32_t id) const; +Q_SIGNALS: + void annotation_visibility_changed(); + +private Q_SLOTS: + void on_row_visibility_changed(); + void on_class_visibility_changed(); + private: const srd_decoder* const srd_decoder_; uint8_t stack_level_; @@ -126,8 +153,8 @@ private: bool visible_; vector channels_; - vector rows_; - vector ann_classes_; + deque rows_; + deque ann_classes_; vector bin_classes_; map options_; srd_decoder_inst *decoder_inst_;