X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=1464b5eea135d19aa7ad70ad41820c703fd7871f;hp=fd440185c4e9c376e4c5cef307c4b88e79e1b923;hb=d4e39570ee6021766c375654801dddba45b9198a;hpb=97904bf71258d3b522b00eb3dcae1efea6bd1298

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index fd440185..1464b5ee 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -68,7 +68,7 @@ void Trace::set_colour(QColor colour)
 	colour_ = colour;
 }
 
-void Trace::paint_label(QPainter &p, int right, bool hover)
+void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	const int y = get_visual_y();
 
@@ -77,7 +77,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	if (!enabled())
 		return;
 
-	const QRectF r = label_rect(right);
+	const QRectF r = label_rect(rect);
 
 	// Paint the label
 	const float label_arrow_length = r.height() / 2;
@@ -115,7 +115,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	p.drawPolygon(points, countof(points));
 
 	// Paint the text
-	p.setPen(get_text_colour());
+	p.setPen(select_text_colour(colour_));
 	p.setFont(QApplication::font());
 	p.drawText(QRectF(r.x(), r.y(),
 		r.width() - label_arrow_length, r.height()),
@@ -124,7 +124,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
 QMenu* Trace::create_context_menu(QWidget *parent)
 {
-	QMenu *const menu = SelectableItem::create_context_menu(parent);
+	QMenu *const menu = ViewItem::create_context_menu(parent);
 
 	return menu;
 }
@@ -143,7 +143,7 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	return popup_;
 }
 
-QRectF Trace::label_rect(int right) const
+QRectF Trace::label_rect(const QRectF &rect) const
 {
 	using pv::view::View;
 
@@ -156,18 +156,13 @@ QRectF Trace::label_rect(int right) const
 		ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
 	const float half_height = label_size.height() / 2;
 	return QRectF(
-		right - half_height - label_size.width() - 0.5,
+		rect.right() - half_height - label_size.width() - 0.5,
 		get_visual_y() + 0.5f - half_height,
 		label_size.width() + half_height,
 		label_size.height());
 }
 
-QColor Trace::get_text_colour() const
-{
-	return (colour_.lightness() > 64) ? Qt::black : Qt::white;
-}
-
-void Trace::paint_axis(QPainter &p, const RowItemPaintParams &pp, int y)
+void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
 	p.setPen(AxisPen);
 	p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));