X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=e9235e56f2713bfd348f29ab6c3c14112968f81d;hb=ced0548eac9932f80994bde76c3c2bb7a14a4b54;hp=1734921a57c568585c648b177f8ce29019eb1a5e;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 1734921..e9235e5 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -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()),
@@ -162,15 +162,10 @@ QRectF Trace::label_rect(int right) const
 		label_size.height());
 }
 
-QColor Trace::get_text_colour() const
-{
-	return (colour_.lightness() > 64) ? Qt::black : Qt::white;
-}
-
-void Trace::paint_axis(QPainter &p, int y, int left, int right)
+void Trace::paint_axis(QPainter &p, const RowItemPaintParams &pp, int y)
 {
 	p.setPen(AxisPen);
-	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+	p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));
 }
 
 void Trace::add_colour_option(QWidget *parent, QFormLayout *form)