X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=508b91c5c385ff7e34fae595105396ba94bc4d66;hp=64ecf83a6079ba4362496077299f26f3f0581233;hb=f9abdc014adda6771828db4c8caa8f66e066b7a3;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 64ecf83a..508b91c5 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -28,6 +28,7 @@ #include #include +#include "decodesignal.h" #include "header.h" #include "ruler.h" #include "signal.h" @@ -70,9 +71,9 @@ View::View(SigSession &session, QWidget *parent) : _scale(1e-6), _offset(0), _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)), @@ -85,14 +86,24 @@ 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()), this, SLOT(on_signals_moved())); + connect(_header, SIGNAL(selection_changed()), + _ruler, SLOT(clear_selection())); + 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); @@ -106,6 +117,11 @@ SigSession& View::session() return _session; } +const SigSession& View::session() const +{ + return _session; +} + double View::scale() const { return _scale; @@ -129,16 +145,12 @@ void View::zoom(double steps) void View::zoom(double steps, int offset) { const double cursor_offset = _offset + _scale * offset; - _scale *= pow(3.0/2.0, -steps); - _scale = max(min(_scale, MaxScale), MinScale); - _offset = cursor_offset - _scale * offset; - - _ruler->update(); - _viewport->update(); - update_scroll(); + const double new_scale = max(min(_scale * pow(3.0/2.0, -steps), + MaxScale), MinScale); + const double new_offset = cursor_offset - new_scale * offset; + set_scale_offset(new_scale, new_offset); } - void View::set_scale_offset(double scale, double offset) { _scale = scale; @@ -147,6 +159,45 @@ void View::set_scale_offset(double scale, double offset) update_scroll(); _ruler->update(); _viewport->update(); + scale_offset_changed(); +} + +vector< shared_ptr > View::get_traces() const +{ + const vector< shared_ptr > sigs( + session().get_signals()); + const vector< shared_ptr > decode_sigs( + session().get_decode_signals()); + vector< shared_ptr > traces( + sigs.size() + decode_sigs.size()); + + vector< shared_ptr >::iterator i = traces.begin(); + i = copy(sigs.begin(), sigs.end(), i); + i = copy(decode_sigs.begin(), decode_sigs.end(), i); + + sort(traces.begin(), traces.end(), compare_trace_v_offsets); + return traces; +} + +list > View::selected_items() const +{ + list > items; + + // List the selected signals + const vector< shared_ptr > traces(get_traces()); + BOOST_FOREACH (shared_ptr t, traces) { + assert(t); + if (t->selected()) + items.push_back(t); + } + + // List the selected cursors + if (_cursors.first()->selected()) + items.push_back(_cursors.first()); + if (_cursors.second()->selected()) + items.push_back(_cursors.second()); + + return items; } bool View::cursors_shown() const @@ -161,7 +212,21 @@ void View::show_cursors(bool show) _viewport->update(); } -std::pair& View::cursors() +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); + _ruler->update(); + _viewport->update(); +} + +CursorPair& View::cursors() +{ + return _cursors; +} + +const CursorPair& View::cursors() const { return _cursors; } @@ -173,20 +238,26 @@ const QPoint& View::hover_point() const void View::normalize_layout() { - const vector< shared_ptr > sigs(_session.get_signals()); + const vector< shared_ptr > traces(get_traces()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr s, sigs) - v_min = min(s->get_v_offset(), v_min); + BOOST_FOREACH(const shared_ptr t, traces) + v_min = min(t->get_v_offset(), v_min); const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr s, sigs) - s->set_v_offset(s->get_v_offset() + delta); + BOOST_FOREACH(shared_ptr t, traces) + t->set_v_offset(t->get_v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); v_scroll_value_changed(verticalScrollBar()->sliderPosition()); } +void View::update_viewport() +{ + assert(_viewport); + _viewport->update(); +} + void View::get_scroll_layout(double &length, double &offset) const { const shared_ptr sig_data = _session.get_data(); @@ -208,7 +279,9 @@ void View::update_scroll() get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); - horizontalScrollBar()->setPageStep(areaSize.width()); + horizontalScrollBar()->setPageStep(areaSize.width() / 2); + + _updating_scroll = true; if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); @@ -219,6 +292,8 @@ void View::update_scroll() _offset * MaxScrollValue / (_scale * length)); } + _updating_scroll = false; + // Set the vertical scrollbar verticalScrollBar()->setPageStep(areaSize.height()); verticalScrollBar()->setRange(0, @@ -226,16 +301,12 @@ void View::update_scroll() areaSize.height()); } -void View::reset_signal_layout() +bool View::compare_trace_v_offsets(const shared_ptr &a, + const shared_ptr &b) { - int offset = SignalMargin; - const vector< shared_ptr > sigs(_session.get_signals()); - BOOST_FOREACH(shared_ptr s, sigs) { - s->set_v_offset(offset); - offset += SignalHeight + 2 * SignalMargin; - } - - normalize_layout(); + assert(a); + assert(b); + return a->get_v_offset() < b->get_v_offset(); } bool View::eventFilter(QObject *object, QEvent *event) @@ -279,7 +350,7 @@ bool View::viewportEvent(QEvent *e) } } -void View::resizeEvent(QResizeEvent *e) +void View::resizeEvent(QResizeEvent*) { _ruler->setGeometry(_viewport->x(), 0, _viewport->width(), _viewport->y()); @@ -290,6 +361,9 @@ void View::resizeEvent(QResizeEvent *e) void View::h_scroll_value_changed(int value) { + if (_updating_scroll) + return; + const int range = horizontalScrollBar()->maximum(); if (range < MaxScrollValue) _offset = _scale * value; @@ -312,7 +386,16 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { - reset_signal_layout(); + int offset = SignalMargin + SignalHeight; + const vector< shared_ptr > traces(get_traces()); + BOOST_FOREACH(shared_ptr t, traces) { + t->set_view(this); + t->init_context_bar_actions(NULL); + t->set_v_offset(offset); + offset += SignalHeight + 2 * SignalMargin; + } + + normalize_layout(); } void View::data_updated()