X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=aba51510db59ad964d9f4213b994c05caf5275d8;hb=1ef49ddd04f44a4369403fbab19ed235483e2975;hp=799a1fe3fac5d70ac421b68c35e690c69c129e85;hpb=33c62f44b72abab27bc141d66712ff0d1a2e395f;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 799a1fe3..aba51510 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -42,9 +42,7 @@ const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
-	_view(NULL),
 	_name(name),
-	_v_offset(0),
 	_popup(NULL),
 	_popup_form(NULL)
 {
@@ -70,47 +68,9 @@ void Trace::set_colour(QColor colour)
 	_colour = colour;
 }
 
-int Trace::get_v_offset() const
-{
-	return _v_offset;
-}
-
-void Trace::set_v_offset(int v_offset)
-{
-	_v_offset = v_offset;
-}
-
-void Trace::set_view(pv::view::View *view)
-{
-	assert(view);
-	_view = view;
-}
-
-void Trace::paint_back(QPainter &p, int left, int right)
-{
-	(void)p;
-	(void)left;
-	(void)right;
-}
-
-void Trace::paint_mid(QPainter &p, int left, int right)
-{
-	(void)p;
-	(void)left;
-	(void)right;
-}
-
-void Trace::paint_fore(QPainter &p, int left, int right)
-{
-	(void)p;
-	(void)left;
-	(void)right;
-}
-
 void Trace::paint_label(QPainter &p, int right, bool hover)
 {
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	const int y = get_y();
 
 	p.setBrush(_colour);
 
@@ -119,23 +79,23 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
 	const QColor colour = get_colour();
 
-	const QRectF label_rect = get_label_rect(right);
+	const QRectF r = label_rect(right);
 
 	// Paint the label
+	const float label_arrow_length = r.height() / 2;
 	const QPointF points[] = {
-		label_rect.topLeft(),
-		label_rect.topRight(),
-		QPointF(right, y),
-		label_rect.bottomRight(),
-		label_rect.bottomLeft()
+		r.topLeft(),
+		QPointF(r.right() - label_arrow_length, r.top()),
+		QPointF(r.right(), y),
+		QPointF(r.right() - label_arrow_length, r.bottom()),
+		r.bottomLeft()
 	};
-
 	const QPointF highlight_points[] = {
-		QPointF(label_rect.left() + 1, label_rect.top() + 1),
-		QPointF(label_rect.right(), label_rect.top() + 1),
-		QPointF(right - 1, y),
-		QPointF(label_rect.right(), label_rect.bottom() - 1),
-		QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
+		QPointF(r.left() + 1, r.top() + 1),
+		QPointF(r.right() - label_arrow_length, r.top() + 1),
+		QPointF(r.right() - 1, y),
+		QPointF(r.right() - label_arrow_length, r.bottom() - 1),
+		QPointF(r.left() + 1, r.bottom() - 1)
 	};
 
 	if (selected()) {
@@ -159,19 +119,9 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	// Paint the text
 	p.setPen(get_text_colour());
 	p.setFont(QApplication::font());
-	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
-}
-
-bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
-{
-	(void)left;
-
-	const QRectF label = get_label_rect(right);
-	return enabled() && QRectF(
-		QPointF(label.left() - LabelHitPadding,
-			label.top() - LabelHitPadding),
-		QPointF(right, label.bottom() + LabelHitPadding)
-			).contains(point);
+	p.drawText(QRectF(r.x(), r.y(),
+		r.width() - label_arrow_length, r.height()),
+		Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
 QMenu* Trace::create_context_menu(QWidget *parent)
@@ -195,17 +145,10 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	return _popup;
 }
 
-int Trace::get_y() const
-{
-	return _v_offset - _view->v_offset();
-}
-
-QRectF Trace::get_label_rect(int right)
+QRectF Trace::label_rect(int right)
 {
 	using pv::view::View;
 
-	assert(_view);
-
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
 		m.boundingRect(QRect(), 0, _name).width(),
@@ -213,15 +156,12 @@ QRectF Trace::get_label_rect(int right)
 	const QSizeF label_size(
 		text_size.width() + View::LabelPadding.width() * 2,
 		ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
-	const float label_arrow_length = label_size.height() / 2;
+	const float half_height = label_size.height() / 2;
 	return QRectF(
-		right - label_arrow_length - label_size.width() - 0.5,
-		get_y() + 0.5f - label_size.height() / 2,
-		label_size.width(), label_size.height());
-}
-
-void Trace::hover_point_changed()
-{
+		right - half_height - label_size.width() - 0.5,
+		get_y() + 0.5f - half_height,
+		label_size.width() + half_height,
+		label_size.height());
 }
 
 QColor Trace::get_text_colour() const