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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 9d6e7fde..34b2699b 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -26,10 +26,11 @@
 
 #include "view.hpp"
 
+#include <QApplication>
 #include <QFormLayout>
+#include <QFontMetrics>
 #include <QPainter>
 
-#include <pv/util.hpp>
 #include <pv/widgets/popup.hpp>
 
 using std::max;
@@ -42,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),
@@ -86,8 +87,31 @@ 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
+{
+	const float x = (time_ - view_.offset()) / view_.scale();
+
+	QFontMetrics m(QApplication::font());
+	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_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, 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));
 
@@ -131,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)