DecodeTrace: Replace magic number by proper calculation

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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 5ec7ee7c5337bd1cdf929f70597c26fe9defa78c..2705d3cf4a90c2fd3ca8b522900cb5bbc555ca81 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -26,6 +26,7 @@
 #include <list>
 #include <map>
 #include <memory>
 #include <list>
 #include <map>
 #include <memory>

+#include <vector>

 
 #include <QSignalMapper>
 
 
 #include <QSignalMapper>
 


@@ -76,6 +77,7 @@ private:
 
        static const int ArrowSize;
        static const double EndCapWidth;
 
        static const int ArrowSize;
        static const double EndCapWidth;

+       static const int RowTitleMargin;

        static const int DrawPadding;
 
        static const QColor Colours[16];
        static const int DrawPadding;
 
        static const QColor Colours[16];


@@ -124,16 +126,23 @@ public:
        void delete_pressed();
 
 private:
        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,
        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,
 
        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,
 
        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);
 
        void draw_error(QPainter &p, const QString &message,
                const ViewItemPaintParams &pp);


@@ -198,7 +207,10 @@ private:
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        std::vector<data::decode::Row> visible_rows_;
        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_;
 };
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };