X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=0ba52b357c8ed80e108b25559b5aa2559716c5cc;hb=HEAD;hp=839b4df9f6863eb406f0a48de88d6925cf279dfe;hpb=a653b83dba6862ddf273c4ca52da6d9451a3dd53;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 839b4df9..0ba52b35 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
 
 #include <config.h>
 #include "trace.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
@@ -123,7 +120,6 @@ class DecodeTrace : public Trace
 	Q_OBJECT
 
 private:
-	static const QColor ErrorBgColor;
 	static const QColor NoDecodeColor;
 	static const QColor ExpandMarkerWarnColor;
 	static const QColor ExpandMarkerHiddenColor;
@@ -201,7 +197,7 @@ private:
 	void draw_annotation(const Annotation* a, QPainter &p,
 		const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) const;
 
-	void draw_annotation_block(qreal start, qreal end, Annotation::Class ann_class,
+	void draw_annotation_block(qreal start, qreal end, uint32_t ann_class,
 		bool use_ann_format, QPainter &p, int y, const DecodeTraceRow& row) const;
 
 	void draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const;
@@ -224,9 +220,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 +256,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();
@@ -283,7 +278,11 @@ private Q_SLOTS:
 
 	void on_show_hide_decoder(int index);
 	void on_show_hide_row(int row_id);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	void on_show_hide_class(QObject* sender);
+#else
 	void on_show_hide_class(QWidget* sender);
+#endif
 	void on_show_all_classes();
 	void on_hide_all_classes();
 	void on_row_container_resized(QWidget* sender);
@@ -318,7 +317,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_;
@@ -339,4 +338,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP