X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=71fbaa85c613d29dab29400edc5fe3d17c76c8c5;hp=bdae3952ee33cf33b57f7377f9d526f8fa805b61;hb=99029fda9b736c04eb2c22c92ca5086fb948bc13;hpb=f054289f67046e0c2d23d0f34eba94a681cc7ccd

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index bdae3952..71fbaa85 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -45,7 +45,7 @@ extern "C" {
 #include <pv/data/decoderstack.hpp>
 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/logic.hpp>
-#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/logicsegment.hpp>
 #include <pv/data/decode/annotation.hpp>
 #include <pv/view/logicsignal.hpp>
 #include <pv/view/view.hpp>
@@ -212,8 +212,8 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 			sample_range.first, sample_range.second);
 		if (!annotations.empty()) {
 			for (const Annotation &a : annotations)
-				draw_annotation(a, p, get_text_colour(),
-					annotation_height, pp, y, base_colour);
+				draw_annotation(a, p, annotation_height,
+					pp, y, base_colour);
 			y += row_height_;
 
 			visible_rows_.push_back(rows[i]);
@@ -333,7 +333,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent)
 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
-	QPainter &p, QColor text_color, int h, const RowItemPaintParams &pp, int y,
+	QPainter &p, int h, const RowItemPaintParams &pp, int y,
 	size_t base_colour) const
 {
 	double samples_per_pixel, pixels_offset;
@@ -353,15 +353,13 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
 		return;
 
 	if (a.start_sample() == a.end_sample())
-		draw_instant(a, p, fill, outline, text_color, h,
-			start, y);
+		draw_instant(a, p, fill, outline, h, start, y);
 	else
-		draw_range(a, p, fill, outline, text_color, h,
-			start, end, y);
+		draw_range(a, p, fill, outline, h, start, end, y);
 }
 
 void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-	QColor fill, QColor outline, QColor text_color, int h, double x, int y) const
+	QColor fill, QColor outline, int h, double x, int y) const
 {
 	const QString text = a.annotations().empty() ?
 		QString() : a.annotations().back();
@@ -373,12 +371,12 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &
 	p.setBrush(fill);
 	p.drawRoundedRect(rect, h / 2, h / 2);
 
-	p.setPen(text_color);
+	p.setPen(Qt::black);
 	p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
 }
 
 void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-	QColor fill, QColor outline, QColor text_color, int h, double start,
+	QColor fill, QColor outline, int h, double start,
 	double end, int y) const
 {
 	const double top = y + .5 - h / 2;
@@ -416,7 +414,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 	if (rect.width() <= 4)
 		return;
 
-	p.setPen(text_color);
+	p.setPen(Qt::black);
 
 	// Try to find an annotation that will fit
 	QString best_annotation;
@@ -453,7 +451,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message,
 	p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
 		Qt::AbsoluteSize);
 
-	p.setPen(get_text_colour());
+	p.setPen(Qt::black);
 	p.drawText(text_rect, message);
 }
 
@@ -474,20 +472,20 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
 
 	// We get the logic data of the first channel in the list.
 	// This works because we are currently assuming all
-	// LogicSignals have the same data/snapshot
+	// LogicSignals have the same data/segment
 	for (const shared_ptr<Decoder> &dec : stack)
 		if (dec && !dec->channels().empty() &&
 			((logic_signal = (*dec->channels().begin()).second)) &&
 			((data = logic_signal->logic_data())))
 			break;
 
-	if (!data || data->logic_snapshots().empty())
+	if (!data || data->logic_segments().empty())
 		return;
 
-	const shared_ptr<LogicSnapshot> snapshot =
-		data->logic_snapshots().front();
-	assert(snapshot);
-	const int64_t sample_count = (int64_t)snapshot->get_sample_count();
+	const shared_ptr<LogicSegment> segment =
+		data->logic_segments().front();
+	assert(segment);
+	const int64_t sample_count = (int64_t)segment->get_sample_count();
 	if (sample_count == 0)
 		return;
 
@@ -558,9 +556,15 @@ int DecodeTrace::get_row_at_point(const QPoint &point)
 	if (!row_height_)
 		return -1;
 
-	const int row = (point.y() - get_visual_y() + row_height_ / 2) /
-		row_height_;
-	if (row < 0 || row >= (int)visible_rows_.size())
+	const int y = (point.y() - get_visual_y() + row_height_ / 2);
+
+	/* Integer divison of (x-1)/x would yield 0, so we check for this. */
+	if (y < 0)
+		return -1;
+
+	const int row = y / row_height_;
+
+	if (row >= (int)visible_rows_.size())
 		return -1;
 
 	return row;
@@ -589,11 +593,6 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
 		QString() : annotations[0].annotations().front();
 }
 
-void DecodeTrace::hide_hover_annotation()
-{
-	QToolTip::hideText();
-}
-
 void DecodeTrace::hover_point_changed()
 {
 	assert(owner_);
@@ -607,7 +606,7 @@ void DecodeTrace::hover_point_changed()
 	assert(view);
 
 	if (!row_height_ || ann.isEmpty()) {
-		hide_hover_annotation();
+		QToolTip::hideText();
 		return;
 	}
 
@@ -628,7 +627,7 @@ void DecodeTrace::hover_point_changed()
 
 	hp.setY(get_visual_y() - (row_height_ / 2) +
 		(hover_row * row_height_) -
-		row_height_ - text_size.height());
+		row_height_ - text_size.height() - padding);
 
 	QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
 }