ViewItem: Moved in paint_fore, paint_mid and paint_back

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

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 6a4733112fbb6882edf3d281aed570cd5f19f538..5f33416050d721b21af2b00835dc341259aeb391 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -45,12 +45,17 @@ Cursor::Cursor(View &view, double time) :
 {
 }
 
+bool Cursor::enabled() const
+{
+       return view_.cursors_shown();
+}
+
 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);
@@ -76,9 +81,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