X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=071967998eac0047d894bca3e8edf712af736878;hp=c4f4b6d7bf64a82f24473442d89d1bfc0f3939ac;hb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;hpb=3a6fe0818affcb40b2821eab3f633e536377dd81

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index c4f4b6d7..07196799 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursor.h"
+#include "cursor.hpp"
 
-#include "ruler.h"
-#include "view.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #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 {
 
@@ -41,76 +44,117 @@ const QColor Cursor::FillColour(52, 101, 164);
 const QColor Cursor::HighlightColour(83, 130, 186);
 const QColor Cursor::TextColour(Qt::white);
 
-const int Cursor::Size = 12;
 const int Cursor::Offset = 1;
 
 const int Cursor::ArrowSize = 4;
 
-Cursor::Cursor(const View &view, double time) :
+Cursor::Cursor(View &view, double time) :
 	TimeMarker(view, LineColour, time)
 {
 }
 
 QRectF Cursor::get_label_rect(const QRect &rect) const
 {
-	const float x = (_time - _view.offset()) / _view.scale();
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
+
+	const float x = (time_ - view_.offset()) / view_.scale();
 
 	const QSizeF label_size(
-		_text_size.width() + View::LabelPadding.width() * 2,
-		_text_size.height() + View::LabelPadding.height() * 2);
-	return QRectF(x - label_size.width() / 2 - 0.5f,
-		rect.height() - label_size.height() - Offset - ArrowSize - 0.5f,
-		label_size.width() + 1, label_size.height() + 1);
+		text_size_.width() + View::LabelPadding.width() * 2,
+		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();
+
+	if (time_ > other->time())
+		return QRectF(x, top, label_size.width(), height);
+	else
+		return QRectF(x - label_size.width(), top,
+			label_size.width(), height);
 }
 
-void Cursor::paint_label(QPainter &p, const QRect &rect,
-	unsigned int prefix)
+void Cursor::paint_label(QPainter &p, const QRect &rect)
 {
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
+
+	const unsigned int prefix = view_.tick_prefix();
+
 	compute_text_size(p, prefix);
 	const QRectF r(get_label_rect(rect));
 
-	const float h_centre = (r.left() + r.right()) / 2;
-	const QPointF points[] = {
+	const QPointF left_points[] = {
+		r.topLeft(),
 		r.topRight(),
-		QPointF(r.right(), r.bottom()),
-		QPointF(h_centre + ArrowSize, r.bottom()),
-		QPointF(h_centre, rect.bottom()),
-		QPointF(h_centre - ArrowSize, r.bottom()),
-		QPointF(r.left(), r.bottom()),
-		r.topLeft()
+		r.bottomRight(),
+		QPointF(r.left() + ArrowSize, r.bottom()),
+		QPointF(r.left(), rect.bottom()),
 	};
 
-	const QPointF highlight_points[] = {
+	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(h_centre + ArrowSize - 1, r.bottom() - 1),
-		QPointF(h_centre, rect.bottom() - 1),
-		QPointF(h_centre - ArrowSize + 1, r.bottom() - 1),
-		QPointF(r.left() + 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(points, countof(left_points));
+	}
+
 	p.setPen(Qt::transparent);
 	p.setBrush(FillColour);
-	p.drawPolygon(points, countof(points));
+	p.drawPolygon(points, countof(left_points));
 
 	p.setPen(HighlightColour);
 	p.setBrush(Qt::transparent);
-	p.drawPolygon(highlight_points, countof(highlight_points));
+	p.drawPolygon(highlight_points, countof(left_highlight_points));
 
 	p.setPen(LineColour);
 	p.setBrush(Qt::transparent);
-	p.drawPolygon(points, countof(points));
+	p.drawPolygon(points, countof(left_points));
 
 	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();
+	text_size_ = p.boundingRect(QRectF(), 0,
+		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