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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 6571bea9..d4bd7140 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -18,18 +18,31 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <algorithm>
+
+#include <extdef.h>
+
 #include "timemarker.hpp"
 
 #include "view.hpp"
 
+#include <QApplication>
 #include <QFormLayout>
+#include <QFontMetrics>
 #include <QPainter>
 
+#include <pv/util.hpp>
 #include <pv/widgets/popup.hpp>
 
+using std::max;
+using std::min;
+
 namespace pv {
 namespace view {
 
+const int TimeMarker::ArrowSize = 4;
+const int TimeMarker::Offset = 1;
+
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
 	view_(view),
 	colour_(colour),
@@ -71,10 +84,78 @@ void TimeMarker::set_time(double time)
 void TimeMarker::paint(QPainter &p, const QRect &rect)
 {
 	const float x = get_x();
-	p.setPen(colour_);
+	p.setPen(colour_.darker());
 	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());
+	QSize text_size = m.boundingRect(
+		pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
+
+	const QSizeF label_size(
+		text_size.width() + View::LabelPadding.width() * 2,
+		text_size.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,
+		label_size.width(), height);
+}
+
+void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+{
+	const qreal x = (time_ - view_.offset()) / view_.scale();
+	const QRectF r(get_label_rect(rect));
+
+	const QPointF points[] = {
+		r.topLeft(),
+		r.bottomLeft(),
+		QPointF(max(r.left(), x - ArrowSize), r.bottom()),
+		QPointF(x, rect.bottom()),
+		QPointF(min(r.right(), x + ArrowSize), r.bottom()),
+		r.bottomRight(),
+		r.topRight()
+	};
+
+	const QPointF highlight_points[] = {
+		QPointF(r.left() + 1, r.top() + 1),
+		QPointF(r.left() + 1, r.bottom() - 1),
+		QPointF(max(r.left() + 1, x - ArrowSize), r.bottom() - 1),
+		QPointF(min(max(r.left() + 1, x), r.right() - 1),
+			rect.bottom() - 1),
+		QPointF(min(r.right() - 1, x + ArrowSize), r.bottom() - 1),
+		QPointF(r.right() - 1, r.bottom() - 1),
+		QPointF(r.right() - 1, r.top() + 1),
+	};
+
+	if (selected()) {
+		p.setPen(highlight_pen());
+		p.setBrush(Qt::transparent);
+		p.drawPolygon(points, countof(points));
+	}
+
+	p.setPen(Qt::transparent);
+	p.setBrush(colour_);
+	p.drawPolygon(points, countof(points));
+
+	p.setPen(colour_.lighter());
+	p.setBrush(Qt::transparent);
+	p.drawPolygon(highlight_points, countof(highlight_points));
+
+	p.setPen(colour_.darker());
+	p.setBrush(Qt::transparent);
+	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));
+}
+
 pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 {
 	using pv::widgets::Popup;