Cursor: Don't draw cursors over each other when they have equal time

[pulseview.git] / pv / view / cursor.cpp

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index f4a5df6f10f4b2e5321b97be12d3d1d825e0a116..512b5fa9791425a6a84f8de5a12bab1f61d6ab2f 100644 (file)
--- 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 {
@@ -55,7 +58,7 @@ QString Cursor::get_text() const
        return pv::util::format_time(time_, view_.tick_prefix(), 2);
 }
 
-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);
@@ -66,13 +69,16 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
        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 double other_time = other->time();
+       if (time_ > other_time ||
+               (abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
+               this > other.get()))
                return QRectF(x, top, label_size.width(), height);
        else
                return QRectF(x - label_size.width(), top,
@@ -81,9 +87,10 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
 
 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