X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=eca6b8eabce92c05575cbefeb1473ea95e424028;hb=58864c5c5dffac4254f199356aaeb5eabd608630;hp=b240af06c1514f0f763e7ce097b7bbcc50cf95b4;hpb=17348f85b8dd4c96aace88f790ba4fda2bccca5a;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index b240af0..eca6b8e 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -85,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().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(&_cursors.second(), SIGNAL(time_changed()), + connect(_cursors.second().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); connect(_header, SIGNAL(signals_moved()), @@ -98,6 +98,11 @@ View::View(SigSession &session, QWidget *parent) : connect(_ruler, SIGNAL(selection_changed()), _header, SLOT(clear_selection())); + connect(_header, SIGNAL(selection_changed()), + this, SIGNAL(selection_changed())); + connect(_ruler, SIGNAL(selection_changed()), + this, SIGNAL(selection_changed())); + setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0); setViewport(_viewport); @@ -169,8 +174,8 @@ void View::show_cursors(bool show) void View::centre_cursors() { const double time_width = _scale * _viewport->width(); - _cursors.first().set_time(_offset + time_width * 0.4); - _cursors.second().set_time(_offset + time_width * 0.6); + _cursors.first()->set_time(_offset + time_width * 0.4); + _cursors.second()->set_time(_offset + time_width * 0.6); _ruler->update(); _viewport->update(); } @@ -180,6 +185,11 @@ CursorPair& View::cursors() return _cursors; } +const CursorPair& View::cursors() const +{ + return _cursors; +} + const QPoint& View::hover_point() const { return _hover_point;