X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=f6c27430942a4d258cb93297b86114c9397354c3;hb=18f7104f875a71bceeb152398b682737528a4ad7;hp=1231eae4830b61ccc0429566963408e5bcbd175a;hpb=d5d1f925b5480e4f7d40a8cbc67bd653fa89bd89;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 1231eae4..f6c27430 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;
 }
@@ -60,7 +58,7 @@ void Trace::set_name(QString name)
 	_name = name;
 }
 
-QColor Trace::get_colour() const
+QColor Trace::colour() const
 {
 	return _colour;
 }
@@ -70,43 +68,6 @@ 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)
 {
 	const int y = get_y();
@@ -116,8 +77,6 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	if (!enabled())
 		return;
 
-	const QColor colour = get_colour();
-
 	const QRectF r = label_rect(right);
 
 	// Paint the label
@@ -144,14 +103,14 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	}
 
 	p.setPen(Qt::transparent);
-	p.setBrush(hover ? colour.lighter() : colour);
+	p.setBrush(hover ? _colour.lighter() : _colour);
 	p.drawPolygon(points, countof(points));
 
-	p.setPen(colour.lighter());
+	p.setPen(_colour.lighter());
 	p.setBrush(Qt::transparent);
 	p.drawPolygon(highlight_points, countof(highlight_points));
 
-	p.setPen(colour.darker());
+	p.setPen(_colour.darker());
 	p.setBrush(Qt::transparent);
 	p.drawPolygon(points, countof(points));
 
@@ -184,12 +143,6 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	return _popup;
 }
 
-int Trace::get_y() const
-{
-	assert(_view);
-	return _v_offset - _view->v_offset();
-}
-
 QRectF Trace::label_rect(int right)
 {
 	using pv::view::View;
@@ -209,10 +162,6 @@ QRectF Trace::label_rect(int right)
 		label_size.height());
 }
 
-void Trace::hover_point_changed()
-{
-}
-
 QColor Trace::get_text_colour() const
 {
 	return (_colour.lightness() > 64) ? Qt::black : Qt::white;