X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=1b30518e04024225586f8e7dbfcc073a57891989;hp=809a0501b20da1a4be759451fb0d51b717a4dff6;hb=b6b267bba9d55d23fe5c3537e4785238d4377ad7;hpb=199441e4fe68f1ee45f3d4b7617a7166a87c7926

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 809a0501..1b30518e 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -33,6 +33,8 @@
 
 #include <extdef.h>
 
+using namespace boost;
+
 namespace pv {
 namespace view {
 
@@ -45,14 +47,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(
@@ -60,9 +64,9 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
 		_text_size.height() + View::LabelPadding.height() * 2);
 	const float top = rect.height() - label_size.height() -
 		Cursor::Offset - Cursor::ArrowSize - 0.5f;
-	const float height = label_size.height() + 1;
+	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,69 +76,66 @@ 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));
 
-	if (_time > _other.time())
-	{
-		const QPointF points[] = {
-			r.topLeft(),
-			r.topRight(),
-			r.bottomRight(),
-			QPointF(r.left() + ArrowSize, r.bottom()),
-			QPointF(r.left(), rect.bottom()),
-		};
-
-		const QPointF highlight_points[] = {
-			QPointF(r.left() + 1, r.top() + 1),
-			QPointF(r.right() - 1, r.top() + 1),
-			QPointF(r.right() - 1, r.bottom() - 1),
-			QPointF(r.left() + ArrowSize - 1, r.bottom() - 1),
-			QPointF(r.left() + 1, rect.bottom() - 1),
-		};
-
-		p.setPen(Qt::transparent);
-		p.setBrush(FillColour);
-		p.drawPolygon(points, countof(points));
-
-		p.setPen(HighlightColour);
+	const QPointF left_points[] = {
+		r.topLeft(),
+		r.topRight(),
+		r.bottomRight(),
+		QPointF(r.left() + ArrowSize, r.bottom()),
+		QPointF(r.left(), rect.bottom()),
+	};
+
+	const QPointF right_points[] = {
+		r.topRight(),
+		r.topLeft(),
+		r.bottomLeft(),
+		QPointF(r.right() - ArrowSize, r.bottom()),
+		QPointF(r.right(), rect.bottom()),
+	};
+
+	const QPointF left_highlight_points[] = {
+		QPointF(r.left() + 1, r.top() + 1),
+		QPointF(r.right() - 1, r.top() + 1),
+		QPointF(r.right() - 1, r.bottom() - 1),
+		QPointF(r.left() + ArrowSize - 1, r.bottom() - 1),
+		QPointF(r.left() + 1, rect.bottom() - 1),
+	};
+
+	const QPointF right_highlight_points[] = {
+		QPointF(r.right() - 1, r.top() + 1),
+		QPointF(r.left() + 1, r.top() + 1),
+		QPointF(r.left() + 1, r.bottom() - 1),
+		QPointF(r.right() - ArrowSize + 1, r.bottom() - 1),
+		QPointF(r.right() - 1, rect.bottom() - 1),
+	};
+
+	const QPointF *const points = (_time > other->time()) ?
+		left_points : right_points;
+	const QPointF *const highlight_points = (_time > other->time()) ?
+		left_highlight_points : right_highlight_points;
+
+	if (selected()) {
+		p.setPen(highlight_pen());
 		p.setBrush(Qt::transparent);
-		p.drawPolygon(highlight_points, countof(highlight_points));
-
-		p.setPen(LineColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(points, countof(points));
+		p.drawPolygon(points, countof(left_points));
 	}
-	else
-	{
-		const QPointF points[] = {
-			r.topRight(),
-			r.topLeft(),
-			r.bottomLeft(),
-			QPointF(r.right() - ArrowSize, r.bottom()),
-			QPointF(r.right(), rect.bottom()),
-		};
-
-		const QPointF highlight_points[] = {
-			QPointF(r.right() - 1, r.top() + 1),
-			QPointF(r.left() + 1, r.top() + 1),
-			QPointF(r.left() + 1, r.bottom() - 1),
-			QPointF(r.right() - ArrowSize + 1, r.bottom() - 1),
-			QPointF(r.right() - 1, rect.bottom() - 1),
-		};
-
-		p.setPen(Qt::transparent);
-		p.setBrush(FillColour);
-		p.drawPolygon(points, countof(points));
-
-		p.setPen(HighlightColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(highlight_points, countof(highlight_points));
 
-		p.setPen(LineColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(points, countof(points));
-	}
+	p.setPen(Qt::transparent);
+	p.setBrush(FillColour);
+	p.drawPolygon(points, countof(left_points));
+
+	p.setPen(HighlightColour);
+	p.setBrush(Qt::transparent);
+	p.drawPolygon(highlight_points, countof(left_highlight_points));
+
+	p.setPen(LineColour);
+	p.setBrush(Qt::transparent);
+	p.drawPolygon(points, countof(left_points));
 
 	p.setPen(TextColour);
 	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
@@ -147,5 +148,12 @@ void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
 		Ruler::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
 } // namespace pv