X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=7432e3048e217c20a3e72a4d06bc6f1fffa4b53b;hp=f4a5df6f10f4b2e5321b97be12d3d1d825e0a116;hb=520362f8c4082820193f09e43b27a8c7df2ef011;hpb=096fb584db59a7b95ea57a6accf6c282a43497f6

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index f4a5df6f..7432e304 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -20,6 +20,7 @@
 
 #include "cursor.hpp"
 
+#include "ruler.hpp"
 #include "view.hpp"
 #include "pv/util.hpp"
 
@@ -32,8 +33,11 @@
 
 #include <cassert>
 #include <cstdio>
+#include <limits>
 
+using std::abs;
 using std::shared_ptr;
+using std::numeric_limits;
 
 namespace pv {
 namespace view {
@@ -52,38 +56,45 @@ bool Cursor::enabled() const
 
 QString Cursor::get_text() const
 {
-	return pv::util::format_time(time_, view_.tick_prefix(), 2);
+	const shared_ptr<Cursor> other = get_other_cursor();
+	const pv::util::Timestamp& diff = abs(time_ - other->time_);
+
+	return Ruler::format_time_with_distance(
+		diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
 }
 
-QRectF Cursor::get_label_rect(const QRect &rect) const
+QRectF Cursor::label_rect(const QRectF &rect) const
 {
 	const shared_ptr<Cursor> other(get_other_cursor());
 	assert(other);
 
-	const float x = (time_ - view_.offset()) / view_.scale();
+	const float x = ((time_ - view_.offset())/ view_.scale()).convert_to<float>();
 
 	QFontMetrics m(QApplication::font());
 	QSize text_size = m.boundingRect(get_text()).size();
 
 	const QSizeF label_size(
-		text_size.width() + View::LabelPadding.width() * 2,
-		text_size.height() + View::LabelPadding.height() * 2);
+		text_size.width() + LabelPadding.width() * 2,
+		text_size.height() + LabelPadding.height() * 2);
 	const float top = rect.height() - label_size.height() -
-		TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+		TimeMarker::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	if (time_ > other->time())
+	const pv::util::Timestamp& other_time = other->time();
+
+	if (time_ > other_time ||
+		(abs(time_ - other_time).is_zero() && this > other.get()))
 		return QRectF(x, top, label_size.width(), height);
 	else
-		return QRectF(x - label_size.width(), top,
-			label_size.width(), height);
+		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();
+	const shared_ptr<CursorPair> cursors(view_.cursors());
+	assert(cursors);
+	return (cursors->first().get() == this) ?
+		cursors->second() : cursors->first();
 }
 
 } // namespace view