Fix #709 by deriving row/ann colors from the channel color

[pulseview.git] / pv / views / trace / decodetrace.hpp

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 7edb30bde3c96b6591e1190d080a7b368e4862c4..692a5f710a3f653adfa93c8ebe6ba95a4ccc7e6b 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -27,8 +27,10 @@
 #include <memory>
 #include <vector>
 
+#include <QColor>
 #include <QComboBox>
 #include <QSignalMapper>
+#include <QTimer>
 
 #include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
@@ -43,8 +45,6 @@ using std::vector;
 struct srd_channel;
 struct srd_decoder;
 
-class QComboBox;
-
 namespace pv {
 
 class Session;
@@ -59,7 +59,7 @@ class Annotation;
 class Decoder;
 class Row;
 }
-}
+}  // namespace data
 
 namespace widgets {
 class DecoderGroupBox;
@@ -73,17 +73,15 @@ class DecodeTrace : public Trace
        Q_OBJECT
 
 private:
-       static const QColor DecodeColours[4];
-       static const QColor ErrorBgColour;
-       static const QColor NoDecodeColour;
+       static const QColor ErrorBgColor;
+       static const QColor NoDecodeColor;
 
        static const int ArrowSize;
        static const double EndCapWidth;
        static const int RowTitleMargin;
        static const int DrawPadding;
 
-       static const QColor Colours[16];
-       static const QColor OutlineColours[16];
+       static const int MaxTraceUpdateRate;
 
 public:
        DecodeTrace(pv::Session &session, shared_ptr<data::SignalBase> signalbase,
@@ -129,14 +127,14 @@ public:
 private:
        void draw_annotations(vector<pv::data::decode::Annotation> annotations,
                QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-               size_t base_colour, int row_title_width);
+               QColor row_color, int row_title_width);
 
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
                int h, const ViewItemPaintParams &pp, int y,
-               size_t base_colour, int row_title_width) const;
+               QColor row_color, int row_title_width) const;
 
        void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
-               QPainter &p, int h, int y, size_t base_colour) const;
+               QPainter &p, int h, int y, QColor row_color) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
                int h, double x, int y) const;
@@ -162,6 +160,9 @@ private:
         */
        pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
 
+       QColor get_row_color(int row_index) const;
+       QColor get_annotation_color(QColor row_color, int annotation_index) const;
+
        int get_row_at_point(const QPoint &point);
 
        const QString get_annotation_at_point(const QPoint &point);
@@ -176,10 +177,13 @@ private:
                const data::DecodeChannel *ch);
 
 public:
-       void hover_point_changed();
+       void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
        void on_new_annotations();
+       void on_delayed_trace_update();
+       void on_decode_reset();
+       void on_decode_finished();
 
        void on_delete();
 
@@ -214,6 +218,8 @@ private:
        int min_useful_label_width_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
+
+       QTimer delayed_trace_updater_;
 };
 
 } // namespace trace