X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=d5b0a641f075a5b9c5d7f4ddd0cb511102aee08a;hp=b854f2c4995be4a3f93a205f0b2c43c67bcbc534;hb=4fabd61a2676246265c12d614cde496bf0a79075;hpb=ca4ec3eab886e62c0f9d0cc91636383a74ad5d7b

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index b854f2c4..d5b0a641 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,49 +18,63 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursor.h"
+#include "cursor.hpp"
 
-#include "view.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
+#include <QApplication>
 #include <QBrush>
 #include <QPainter>
+#include <QPointF>
 #include <QRect>
 #include <QRectF>
 
+#include <cassert>
+#include <cstdio>
+
+using std::shared_ptr;
+
 namespace pv {
 namespace view {
 
-const QColor Cursor::LineColour(32, 74, 135);
 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;
 
-Cursor::Cursor(const View &view, double time) :
-	TimeMarker(view, LineColour, time)
+Cursor::Cursor(View &view, double time) :
+	TimeMarker(view, FillColour, time)
 {
 }
 
 QRectF Cursor::get_label_rect(const QRect &rect) const
 {
-	const float x = (_time - _view.offset()) / _view.scale();
-	return QRectF(x - Size/2, rect.height() - Size - Offset,
-		Size, Size);
-}
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
 
-void Cursor::paint_label(QPainter &p, const QRect &rect)
-{
-	const QRectF r(get_label_rect(rect));
+	const float x = (time_ - view_.offset()) / view_.scale();
 
-	p.setPen(LineColour);
-	p.setBrush(QBrush(FillColour));
-	p.drawEllipse(r);
+	QFontMetrics m(QApplication::font());
+	QSize text_size = m.boundingRect(
+		pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
 
-	p.setPen(HighlightColour);
-	p.setBrush(QBrush());
-	p.drawEllipse(r.adjusted(1, 1, -1, -1));
+	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();
+
+	if (time_ > other->time())
+		return QRectF(x, top, label_size.width(), height);
+	else
+		return QRectF(x - label_size.width(), top,
+			label_size.width(), height);
+}
+
+shared_ptr<Cursor> Cursor::get_other_cursor() const
+{
+	const CursorPair &cursors = view_.cursors();
+	return (cursors.first().get() == this) ?
+		cursors.second() : cursors.first();
 }
 
 } // namespace view