X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=98b7289f11f0babd8c1bf73b33959d89ba0f1031;hb=0dda6fe595932b2e340930104fad8ac4fc574895;hp=7a4272f956642b1129d1c3c37987074ff99cafa7;hpb=f796cf5163179e9df5cac676d0e3131be765b013;p=pulseview.git

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 7a4272f9..98b7289f 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -20,8 +20,8 @@
 
 #include "cursor.h"
 
-#include "ruler.h"
 #include "view.h"
+#include "pv/util.h"
 
 #include <QBrush>
 #include <QPainter>
@@ -29,10 +29,13 @@
 #include <QRect>
 #include <QRectF>
 
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 
 #include <extdef.h>
 
+using std::shared_ptr;
+
 namespace pv {
 namespace view {
 
@@ -45,14 +48,16 @@ const int Cursor::Offset = 1;
 
 const int Cursor::ArrowSize = 4;
 
-Cursor::Cursor(const View &view, double time, Cursor &other) :
-	TimeMarker(view, LineColour, time),
-	_other(other)
+Cursor::Cursor(View &view, double time) :
+	TimeMarker(view, LineColour, time)
 {
 }
 
 QRectF Cursor::get_label_rect(const QRect &rect) const
 {
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
+
 	const float x = (_time - _view.offset()) / _view.scale();
 
 	const QSizeF label_size(
@@ -62,7 +67,7 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
 		Cursor::Offset - Cursor::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	if (_time > _other.time())
+	if (_time > other->time())
 		return QRectF(x, top, label_size.width(), height);
 	else
 		return QRectF(x - label_size.width(), top,
@@ -72,6 +77,9 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
 void Cursor::paint_label(QPainter &p, const QRect &rect,
 	unsigned int prefix)
 {
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
+
 	compute_text_size(p, prefix);
 	const QRectF r(get_label_rect(rect));
 
@@ -107,9 +115,9 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
 		QPointF(r.right() - 1, rect.bottom() - 1),
 	};
 
-	const QPointF *const points = (_time > _other.time()) ?
+	const QPointF *const points = (_time > other->time()) ?
 		left_points : right_points;
-	const QPointF *const highlight_points = (_time > _other.time()) ?
+	const QPointF *const highlight_points = (_time > other->time()) ?
 		left_highlight_points : right_highlight_points;
 
 	if (selected()) {
@@ -132,13 +140,20 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
 
 	p.setPen(TextColour);
 	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-		Ruler::format_time(_time, prefix, 2));
+		pv::util::format_time(_time, prefix, 2));
 }
 
 void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
 {
 	_text_size = p.boundingRect(QRectF(), 0,
-		Ruler::format_time(_time, prefix, 2)).size();
+		pv::util::format_time(_time, prefix, 2)).size();
+}
+
+shared_ptr<Cursor> Cursor::get_other_cursor() const
+{
+	const CursorPair &cursors = _view.cursors();
+	return (cursors.first().get() == this) ?
+		cursors.second() : cursors.first();
 }
 
 } // namespace view