X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=eebac024cca0c81608d5452a560544e235081813;hb=d4e39570ee6021766c375654801dddba45b9198a;hp=d4bd7140e92fba17cdf300495c35331cfa24ac1f;hpb=ced0548eac9932f80994bde76c3c2bb7a14a4b54;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index d4bd7140..eebac024 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -31,7 +31,6 @@
 #include <QFontMetrics>
 #include <QPainter>
 
-#include <pv/util.hpp>
 #include <pv/widgets/popup.hpp>
 
 using std::max;
@@ -44,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),
@@ -88,29 +87,33 @@ void TimeMarker::paint(QPainter &p, const QRect &rect)
 	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();
 
 	QFontMetrics m(QApplication::font());
-	QSize text_size = m.boundingRect(
-		pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
+	const float text_width =
+		max(m.boundingRect(get_text()).size().width(), ArrowSize);
+	const float text_height = m.boundingRect("Tg").size().height();
 
 	const QSizeF label_size(
-		text_size.width() + View::LabelPadding.width() * 2,
-		text_size.height() + View::LabelPadding.height() * 2);
+		text_width + View::LabelPadding.width() * 2,
+		text_height + View::LabelPadding.height() * 2);
 	const float top = rect.height() - label_size.height() -
 		TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	return QRectF(x - label_size.width() / 2 - 0.5f, top,
+	return QRectF(x - label_size.width() / 2, top,
 		label_size.width(), height);
 }
 
 void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 {
+	if (!enabled())
+		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(),
@@ -152,8 +155,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 	p.drawPolygon(points, countof(points));
 
 	p.setPen(select_text_colour(colour_));
-	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-		pv::util::format_time(time_, view_.tick_prefix(), 2));
+	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
 pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)