X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=ad3830590a8b059a1d3006275c3e812f0dff2e8e;hb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6;hp=d1c16ba8a9339f665fe0064e09cd80c1dc293567;hpb=312f40835968f3fff4669942ce139b69abf83a92;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index d1c16ba..ad38305 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -43,7 +43,7 @@ const int TimeMarker::ArrowSize = 4;
 const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-	view_(view),
+	TimeItem(view),
 	colour_(colour),
 	time_(time),
 	value_action_(NULL),
@@ -80,14 +80,7 @@ void TimeMarker::set_time(double time)
 	time_changed();
 }
 
-void TimeMarker::paint(QPainter &p, const QRect &rect)
-{
-	const float x = get_x();
-	p.setPen(colour_.darker());
-	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
-}
-
-QRectF TimeMarker::get_label_rect(const QRect &rect) const
+QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
 	const float x = (time_ - view_.offset()) / view_.scale();
 
@@ -113,7 +106,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 		return;
 
 	const qreal x = (time_ - view_.offset()) / view_.scale();
-	const QRectF r(get_label_rect(rect));
+	const QRectF r(label_rect(rect));
 
 	const QPointF points[] = {
 		r.topLeft(),
@@ -158,6 +151,16 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (!enabled())
+		return;
+
+	const float x = get_x();
+	p.setPen(colour_.darker());
+	p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
+}
+
 pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 {
 	using pv::widgets::Popup;