X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=4575d05e2b7dd0fc58009a4bc927892dbe52a9a3;hb=5c5ce7574062e0d3ad4f7d9dde70b482315d54fb;hp=28408eee39db4723497d906ae8a21b02e901427d;hpb=5a0192d4091b29e1e8e103482a498bd6c050c666;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 28408ee..4575d05 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -104,7 +104,7 @@ View::View(Session &session, QWidget *parent) : tick_period_(0.0), tick_prefix_(0), show_cursors_(false), - cursors_(*this), + cursors_(new CursorPair(*this)), hover_point_(-1, -1) { connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), @@ -121,9 +121,9 @@ View::View(Session &session, QWidget *parent) : connect(&session_, SIGNAL(frame_ended()), this, SLOT(data_updated())); - connect(cursors_.first().get(), SIGNAL(time_changed()), + connect(cursors_->first().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(cursors_.second().get(), SIGNAL(time_changed()), + connect(cursors_->second().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); connect(header_, SIGNAL(signals_moved()), @@ -198,8 +198,8 @@ const Viewport* View::viewport() const vector< shared_ptr > View::time_items() const { vector< shared_ptr > items; - items.push_back(cursors_.first()); - items.push_back(cursors_.second()); + items.push_back(cursors_->first()); + items.push_back(cursors_->second()); return items; } @@ -357,18 +357,13 @@ 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); cursorheader_->update(); viewport_->update(); } -CursorPair& View::cursors() -{ - return cursors_; -} - -const CursorPair& View::cursors() const +std::shared_ptr View::cursors() const { return cursors_; }