X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=f56953209293532716cad294997482b4348dfa65;hp=2705d3cf4a90c2fd3ca8b522900cb5bbc555ca81;hb=bb7dd726eb7159ddd80d94ede791f2e2a9eaef0f;hpb=752281db3591fe0eeb2590379b2055b8e05cd14f diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp index 2705d3cf..f5695320 100644 --- a/pv/view/decodetrace.hpp +++ b/pv/view/decodetrace.hpp @@ -31,6 +31,7 @@ #include #include +#include #include struct srd_channel; @@ -44,6 +45,7 @@ class Session; namespace data { class DecoderStack; +class SignalBase; namespace decode { class Annotation; @@ -84,14 +86,15 @@ private: static const QColor OutlineColours[16]; public: - DecodeTrace(pv::Session &session, - std::shared_ptr decoder_stack, + DecodeTrace(pv::Session &session, std::shared_ptr signalbase, int index); bool enabled() const; const std::shared_ptr& decoder() const; + std::shared_ptr base() const; + /** * Computes the vertical extents of the contents of this row item. * @return A pair containing the minimum and maximum y-values. @@ -196,8 +199,9 @@ private Q_SLOTS: private: pv::Session &session_; - std::shared_ptr decoder_stack_; + std::shared_ptr signalbase_; + std::vector visible_rows_; uint64_t decode_start_, decode_end_; std::list< std::shared_ptr > @@ -206,7 +210,6 @@ private: std::list channel_selectors_; std::vector decoder_forms_; - std::vector visible_rows_; std::map row_title_widths_; int row_height_, max_visible_rows_;