Move view-independent data from view::DecodeTrace to SignalBase

[pulseview.git] / pv / view / decodetrace.hpp

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 92544ae2b424b3490b323d7eb032ea6e0a20d64e..f56953209293532716cad294997482b4348dfa65 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -31,6 +31,7 @@
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/signalbase.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -44,6 +45,7 @@ class Session;
 
 namespace data {
 class DecoderStack;
+class SignalBase;
 
 namespace decode {
 class Annotation;
@@ -77,20 +79,22 @@ private:
 
        static const int ArrowSize;
        static const double EndCapWidth;
+       static const int RowTitleMargin;
        static const int DrawPadding;
 
        static const QColor Colours[16];
        static const QColor OutlineColours[16];
 
 public:
-       DecodeTrace(pv::Session &session,
-               std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+       DecodeTrace(pv::Session &session, std::shared_ptr<data::SignalBase> signalbase,
                int index);
 
        bool enabled() const;
 
        const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
+       std::shared_ptr<data::SignalBase> base() const;
+
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
@@ -127,21 +131,21 @@ public:
 private:
        void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
                QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-               size_t base_colour);
+               size_t base_colour, int row_title_width);
 
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-               int text_height, const ViewItemPaintParams &pp, int y,
-               size_t base_colour) const;
+               int h, const ViewItemPaintParams &pp, int y,
+               size_t base_colour, int row_title_width) const;
 
-       void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
+       void draw_annotation_block(std::vector<pv::data::decode::Annotation> annotations,
                QPainter &p, int h, int y, size_t base_colour) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-               QColor fill, QColor outline, int h, double x, int y) const;
+               int h, double x, int y) const;
 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-               QColor fill, QColor outline, int h, double start,
-               double end, int y) const;
+               int h, double start, double end, int y, const ViewItemPaintParams &pp,
+               int row_title_width) const;
 
        void draw_error(QPainter &p, const QString &message,
                const ViewItemPaintParams &pp);
@@ -195,8 +199,9 @@ private Q_SLOTS:
 
 private:
        pv::Session &session_;
-       std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+       std::shared_ptr<data::SignalBase> signalbase_;
 
+       std::vector<data::decode::Row> visible_rows_;
        uint64_t decode_start_, decode_end_;
 
        std::list< std::shared_ptr<pv::binding::Decoder> >
@@ -205,8 +210,10 @@ private:
        std::list<ChannelSelector> channel_selectors_;
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
-       std::vector<data::decode::Row> visible_rows_;
-       int row_height_;
+       std::map<data::decode::Row, int> row_title_widths_;
+       int row_height_, max_visible_rows_;
+
+       int min_useful_label_width_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };