Improved decode annotation colouring

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 2df848acbba38110c95d4018b9d48be33ceddf8a..cd8a82d667f83b24cc5a123a9592cbe0f1399ec0 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -45,9 +45,14 @@ class DecoderStack;
 namespace decode {
 class Annotation;
 class Decoder;
+class Row;
 }
 }
 
+namespace widgets {
+class DecoderGroupBox;
+}
+
 namespace view {
 
 class DecodeTrace : public Trace
@@ -70,7 +75,8 @@ private:
        static const double EndCapWidth;
        static const int DrawPadding;
 
-       static const QColor Colours[7];
+       static const QColor Colours[16];
+       static const QColor OutlineColours[16];
 
 public:
        DecodeTrace(pv::SigSession &session,
@@ -108,7 +114,8 @@ public:
 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;
+               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,
@@ -148,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;
 
@@ -157,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