X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=367891a22c67e72b21a68057ba553c9d0ba50e7a;hb=0a47889b01386b1e55c7df73ca301046a195ff97;hp=91ce9997ed49f3a75ad5ac4077e90bc0d39ad669;hpb=1053d05c140fc52caa8829f0d4827add4eeb40f4;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 91ce999..367891a 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -42,15 +42,13 @@ 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)
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
 	return _name;
 }
@@ -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);
 
@@ -122,19 +82,19 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	const QRectF r = label_rect(right);
 
 	// Paint the label
+	const float label_arrow_length = r.height() / 2;
 	const QPointF points[] = {
 		r.topLeft(),
-		r.topRight(),
-		QPointF(right, y),
-		r.bottomRight(),
+		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(r.left() + 1, r.top() + 1),
-		QPointF(r.right(), r.top() + 1),
-		QPointF(right - 1, y),
-		QPointF(r.right(), r.bottom() - 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)
 	};
 
@@ -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(r, Qt::AlignCenter | Qt::AlignVCenter, _name);
-}
-
-bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
-{
-	(void)left;
-
-	const QRectF label = 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::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::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