X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=67c9b1c48409e4e2a2525f6592ee3d47d963afde;hp=e9b046c2d86bb088389f53682b6d8f6732248ffe;hb=f14dee773586e9f6afbeac8b7f552fb378f36d9b;hpb=85125b0f34be424fdf8a8a5133f2494722077d7d

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index e9b046c2..67c9b1c4 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -612,9 +612,12 @@ void DecodeTrace::hover_point_changed(const QPoint &hp)
 		r.expand_marker_highlighted = false;
 
 	if (hover_row) {
-		int row_y = get_row_y(hover_row);
+		const pair<int, int> extents = v_extents();
+		const int trace_top = get_visual_y() + extents.first;
+		const int trace_btm = get_visual_y() + extents.second;
+
 		if ((hp.x() > 0) && (hp.x() < (int)(ArrowSize + 3 + hover_row->title_width)) &&
-			(hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) {
+			(hp.y() > trace_top) && (hp.y() < trace_btm)) {
 
 			hover_row->expand_marker_highlighted = true;
 			show_hidden_rows_ = true;
@@ -697,7 +700,7 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event)
 void DecodeTrace::draw_annotations(deque<const Annotation*>& annotations,
 		QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row)
 {
-	Annotation::Class block_class = 0;
+	uint32_t block_class = 0;
 	bool block_class_uniform = true;
 	qreal block_start = 0;
 	int block_ann_count = 0;
@@ -802,7 +805,7 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p,
 }
 
 void DecodeTrace::draw_annotation_block(qreal start, qreal end,
-	Annotation::Class ann_class, bool use_ann_format, QPainter &p, int y,
+	uint32_t ann_class, bool use_ann_format, QPainter &p, int y,
 	const DecodeTraceRow& row) const
 {
 	const double top = y + .5 - annotation_height_ / 2;
@@ -1142,7 +1145,7 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha
 
 	QComboBox *selector = new QComboBox(parent);
 
-	selector->addItem("-", qVariantFromValue((void*)nullptr));
+	selector->addItem("-", QVariant::fromValue((void*)nullptr));
 
 	if (!ch->assigned_signal)
 		selector->setCurrentIndex(0);
@@ -1151,7 +1154,7 @@ QComboBox* DecodeTrace::create_channel_selector(QWidget *parent, const DecodeCha
 		assert(b);
 		if (b->logic_data() && b->enabled()) {
 			selector->addItem(b->name(),
-				qVariantFromValue((void*)b.get()));
+				QVariant::fromValue((void*)b.get()));
 
 			if (ch->assigned_signal == b.get())
 				selector->setCurrentIndex(selector->count() - 1);
@@ -1166,9 +1169,9 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent,
 {
 	QComboBox *selector = new QComboBox(parent);
 
-	selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW));
-	selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH));
-	selector->addItem("X", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
+	selector->addItem("0", QVariant::fromValue((int)SRD_INITIAL_PIN_LOW));
+	selector->addItem("1", QVariant::fromValue((int)SRD_INITIAL_PIN_HIGH));
+	selector->addItem("X", QVariant::fromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
 
 	selector->setCurrentIndex(ch->initial_pin_state);
 
@@ -1340,7 +1343,7 @@ void DecodeTrace::initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id)
 	for (const AnnotationClass* ann_class : ann_classes) {
 		cb = new QCheckBox();
 		cb->setText(tr(ann_class->description));
-		cb->setChecked(ann_class->visible);
+		cb->setChecked(ann_class->visible());
 
 		int dim = ViewItemPaintParams::text_height() - 2;
 		QPixmap pixmap(dim, dim);
@@ -1621,7 +1624,7 @@ void DecodeTrace::on_show_hide_class(QWidget* sender)
 	assert(ann_class_ptr);
 	AnnotationClass* ann_class = (AnnotationClass*)ann_class_ptr;
 
-	ann_class->visible = !ann_class->visible;
+	ann_class->set_visible(!ann_class->visible());
 
 	void* row_ptr = sender->property("decode_trace_row_ptr").value<void*>();
 	assert(row_ptr);