X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=cd8a82d667f83b24cc5a123a9592cbe0f1399ec0;hb=287d607f16c890e33355337436f182205baf466c;hp=9f0e68b5deee5cd8fc0229f9182c2d526d4d11b4;hpb=bf51365c1ff176d5ecb6a2a1f3da09cb1086ea46;p=pulseview.git diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h index 9f0e68b5..cd8a82d6 100644 --- a/pv/view/decodetrace.h +++ b/pv/view/decodetrace.h @@ -45,9 +45,14 @@ class DecoderStack; namespace decode { class Annotation; class Decoder; +class Row; } } +namespace widgets { +class DecoderGroupBox; +} + namespace view { class DecodeTrace : public Trace @@ -70,7 +75,8 @@ private: static const double EndCapWidth; static const int DrawPadding; - static const QColor Colours[7]; + static const QColor Colours[16]; + static const QColor OutlineColours[16]; public: DecodeTrace(pv::SigSession &session, @@ -109,7 +115,7 @@ private: void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, QColor text_colour, int text_height, int left, int right, double samples_per_pixel, double pixels_offset, int y, - unsigned int row_index) const; + size_t base_colour) const; void draw_instant(const pv::data::decode::Annotation &a, QPainter &p, QColor fill, QColor outline, QColor text_color, int h, double x, @@ -149,6 +155,8 @@ private slots: void on_delete_decoder(int index); + void on_show_hide_decoder(int index); + private: boost::shared_ptr _decoder_stack; @@ -158,8 +166,9 @@ private: _bindings; std::list _probe_selectors; + std::vector _decoder_forms; - QSignalMapper _delete_mapper; + QSignalMapper _delete_mapper, _show_hide_mapper; }; } // namespace view