Improved row annotation colouring

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index ccf4a0f7bbe4d64d9c421b3eb25c446fc0e67934..9f0e68b5deee5cd8fc0229f9182c2d526d4d11b4 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -43,6 +43,7 @@ namespace data {
 class DecoderStack;
 
 namespace decode {
+class Annotation;
 class Decoder;
 }
 }
@@ -64,6 +65,12 @@ private:
 private:
        static const QColor DecodeColours[4];
        static const QColor ErrorBgColour;
+       static const QColor NoDecodeColour;
+
+       static const double EndCapWidth;
+       static const int DrawPadding;
+
+       static const QColor Colours[7];
 
 public:
        DecodeTrace(pv::SigSession &session,
@@ -99,9 +106,25 @@ public:
        void delete_pressed();
 
 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;
+
+       void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
+               QColor fill, QColor outline, QColor text_color, int h, double x,
+               int y) const;
+
+       void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
+               QColor fill, QColor outline, QColor text_color, int h, double start,
+               double end, int y) const;
+
        void draw_error(QPainter &p, const QString &message,
                int left, int right);
 
+       void draw_unresolved_period(QPainter &p, int h, int left,
+               int right, double samples_per_pixel, double pixels_offset);
+
        void create_decoder_form(int index,
                boost::shared_ptr<pv::data::decode::Decoder> &dec,
                QWidget *parent, QFormLayout *form);