X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=e4704be497500fd3323ef254ca2dc6c35086d06f;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hp=5f33416050d721b21af2b00835dc341259aeb391;hpb=689dea92f288564260ef521f6f499e03e3cdbbd2;p=pulseview.git

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 5f33416..e4704be 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -32,8 +32,11 @@
 
 #include <cassert>
 #include <cstdio>
+#include <limits>
 
+using std::abs;
 using std::shared_ptr;
+using std::numeric_limits;
 
 namespace pv {
 namespace view {
@@ -52,7 +55,8 @@ bool Cursor::enabled() const
 
 QString Cursor::get_text() const
 {
-	return pv::util::format_time(time_, view_.tick_prefix(), 2);
+	return util::format_time(time_, view_.tick_prefix(),
+		view_.time_unit(), 2);
 }
 
 QRectF Cursor::label_rect(const QRectF &rect) const
@@ -60,23 +64,25 @@ 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