X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=ed9df36064f74407b1a1ee81f80d11378adbc81c;hb=dbfae3f1b55b984c7ee7e619a8da53b77db98c90;hp=34b2699bd6722fe9b5f3b169266f3341eb3eabad;hpb=ad341c3a893c66cfd59ac66eedb1de405ed0dbbb;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 34b2699b..ed9df360 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -57,16 +57,6 @@ double TimeMarker::time() const
 	return time_;
 }
 
-float TimeMarker::get_x() const
-{
-	return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
-	return QPoint(get_x(), 0);
-}
-
 void TimeMarker::set_time(double time)
 {
 	time_ = time;
@@ -77,17 +67,20 @@ void TimeMarker::set_time(double time)
 		updating_value_widget_ = false;
 	}
 
-	time_changed();
+	view_.time_item_appearance_changed(true, true);
 }
 
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
 {
-	const float x = get_x();
-	p.setPen(colour_.darker());
-	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+	return (time_ - view_.offset()) / view_.scale();
 }
 
-QRectF TimeMarker::get_label_rect(const QRect &rect) const
+QPoint TimeMarker::point() const
+{
+	return QPoint(get_x(), 0);
+}
+
+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;
@@ -183,10 +186,8 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 void TimeMarker::on_value_changed(double value)
 {
-	if (!updating_value_widget_) {
-		time_ = value;
-		time_changed();
-	}
+	if (!updating_value_widget_)
+		set_time(value);
 }
 
 } // namespace view