X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=9c793bb8e635c4443c7b762186f1969df0752886;hp=95b8a5bec9e9f1fde845898ee5ed7a0cf1bfcc58;hb=b42d25c43e52c900cbdd3e5cde0282961b8721e7;hpb=140181a46034cf65739ba4bf0bf1260ab94ac736 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 95b8a5be..9c793bb8 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -72,8 +72,7 @@ View::View(SigSession &session, QWidget *parent) : _v_offset(0), _updating_scroll(false), _show_cursors(false), - _cursors(pair(Cursor(*this, 0.0), - Cursor(*this, 1.0))), + _cursors(*this), _hover_point(-1, -1) { connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), @@ -86,9 +85,9 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(data_updated()), this, SLOT(data_updated())); - connect(&_cursors.first, SIGNAL(time_changed()), + connect(&_cursors.first(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(&_cursors.second, SIGNAL(time_changed()), + connect(&_cursors.second(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); connect(_header, SIGNAL(signals_moved()), @@ -162,7 +161,7 @@ void View::show_cursors(bool show) _viewport->update(); } -std::pair& View::cursors() +CursorPair& View::cursors() { return _cursors; }