Improved decode annotation colouring

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index ccf4a0f7bbe4d64d9c421b3eb25c446fc0e67934..cd8a82d667f83b24cc5a123a9592cbe0f1399ec0 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -43,10 +43,16 @@ namespace data {
 class DecoderStack;
 
 namespace decode {
+class Annotation;
 class Decoder;
+class Row;
 }
 }
 
+namespace widgets {
+class DecoderGroupBox;
+}
+
 namespace view {
 
 class DecodeTrace : public Trace
@@ -64,6 +70,13 @@ 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[16];
+       static const QColor OutlineColours[16];
 
 public:
        DecodeTrace(pv::SigSession &session,
@@ -99,9 +112,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,
+               size_t base_colour) 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);
@@ -126,6 +155,8 @@ private slots:
 
        void on_delete_decoder(int index);
 
+       void on_show_hide_decoder(int index);
+
 private:
        boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
@@ -135,8 +166,9 @@ private:
                _bindings;
 
        std::list<ProbeSelector> _probe_selectors;
+       std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
-       QSignalMapper _delete_mapper;
+       QSignalMapper _delete_mapper, _show_hide_mapper;
 };
 
 } // namespace view