X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=166fc1abc6831beb966adf001f7bdc92024a1356;hp=ca5f7150353ac67f03f94aae996d37e49d4a35eb;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hpb=b5cb6c35e5475e143554ec6daea86310de5e32a5

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ca5f7150..166fc1ab 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,55 +68,15 @@ 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_visual_y();
 
 	p.setBrush(_colour);
 
 	if (!enabled())
 		return;
 
-	const QColor colour = get_colour();
-
 	const QRectF r = label_rect(right);
 
 	// Paint the label
@@ -145,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));
 
@@ -164,12 +122,6 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 		Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
-bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
-{
-	(void)left;
-	return enabled() && label_rect(right).contains(point);
-}
-
 QMenu* Trace::create_context_menu(QWidget *parent)
 {
 	QMenu *const menu = SelectableItem::create_context_menu(parent);
@@ -191,17 +143,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)
+QRectF Trace::label_rect(int right) const
 {
 	using pv::view::View;
 
-	assert(_view);
-
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
 		m.boundingRect(QRect(), 0, _name).width(),
@@ -212,15 +157,11 @@ QRectF Trace::label_rect(int right)
 	const float half_height = label_size.height() / 2;
 	return QRectF(
 		right - half_height - label_size.width() - 0.5,
-		get_y() + 0.5f - half_height,
+		get_visual_y() + 0.5f - half_height,
 		label_size.width() + half_height,
 		label_size.height());
 }
 
-void Trace::hover_point_changed()
-{
-}
-
 QColor Trace::get_text_colour() const
 {
 	return (_colour.lightness() > 64) ? Qt::black : Qt::white;
@@ -282,13 +223,13 @@ void Trace::on_popup_closed()
 void Trace::on_text_changed(const QString &text)
 {
 	set_name(text);
-	text_changed();
+	appearance_changed();
 }
 
 void Trace::on_colour_changed(const QColor &colour)
 {
 	set_colour(colour);
-	colour_changed();
+	appearance_changed();
 }
 
 } // namespace view