Moved annotation painting code into DecodeTrace, and moved Annotation in pv::data...

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 02ea023bf87e5f6f697a3c9958846099b80605e3..2df848acbba38110c95d4018b9d48be33ceddf8a 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;
 }
 }
@@ -66,6 +67,11 @@ private:
        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,
                boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
@@ -100,6 +106,18 @@ 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) 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);