Add row colors and some fixes

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

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 839b4df9f6863eb406f0a48de88d6925cf279dfe..4d6d4f8e883cdc897a0c812bea406d0dfbdb5c56 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <QColor>
+#include <QComboBox>
 #include <QCheckBox>
 #include <QElapsedTimer>
 #include <QPolygon>
@@ -99,10 +100,6 @@ struct DecodeTraceRow {
        QWidget* selector_container;
        QCheckBox* row_visibility_checkbox;
        vector<QCheckBox*> selectors;
-
-       QColor row_color;
-       map<uint32_t, QColor> ann_class_color;
-       map<uint32_t, QColor> ann_class_dark_color;
 };
 
 class ContainerWidget : public QWidget
@@ -224,9 +221,6 @@ private:
         */
        pair<uint64_t, uint64_t> get_view_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;
-
        unsigned int get_row_y(const DecodeTraceRow* row) const;
 
        DecodeTraceRow* get_row_at_point(const QPoint &point);
@@ -263,6 +257,8 @@ private:
 private Q_SLOTS:
        void on_setting_changed(const QString &key, const QVariant &value);
 
+       void on_color_changed(const QColor &color);
+
        void on_new_annotations();
        void on_delayed_trace_update();
        void on_decode_reset();
@@ -318,7 +314,7 @@ private:
        QPushButton* stack_button_;
 
        unsigned int default_row_height_, annotation_height_;
-       unsigned int visible_rows_, max_visible_rows_;
+       unsigned int visible_rows_;
 
        int min_useful_label_width_;
        bool always_show_all_rows_, show_hidden_rows_;