Introduce pv::data::SignalBase

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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 5ec7ee7c5337bd1cdf929f70597c26fe9defa78c..96332d97b46c8a3842ed1f8fa580ae9a59528ebf 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -26,10 +26,12 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <vector>
 
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/signalbase.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -76,13 +78,14 @@ 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,
+       DecodeTrace(pv::Session &session, std::shared_ptr<data::SignalBase> signalbase,
                std::shared_ptr<pv::data::DecoderStack> decoder_stack,
                int index);
 
@@ -124,16 +127,23 @@ public:
        void delete_pressed();
 
 private:
+       void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
+               QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+               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> 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);
@@ -187,6 +197,7 @@ private Q_SLOTS:
 
 private:
        pv::Session &session_;
+       std::shared_ptr<data::SignalBase> signalbase_;
        std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
 
        uint64_t decode_start_, decode_end_;
@@ -198,7 +209,10 @@ private:
        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_;
 };