X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=0ebfea1e6d532b94c959569aaf5f1e9d03e601d4;hp=438f72ddae02e018ab7f55c42f6c1645f0a94160;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 438f72dd..0ebfea1e 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -26,10 +26,6 @@ #include #include -#include - -#include - #include #include #include @@ -47,10 +43,13 @@ using boost::shared_ptr; using boost::weak_ptr; +using pv::data::SignalData; using std::deque; using std::list; using std::max; +using std::make_pair; using std::min; +using std::pair; using std::set; using std::vector; @@ -76,7 +75,6 @@ View::View(SigSession &session, QWidget *parent) : _viewport(new Viewport(*this)), _ruler(new Ruler(*this)), _header(new Header(*this)), - _data_length(0), _scale(1e-6), _offset(0), _v_offset(0), @@ -92,7 +90,9 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(signals_changed()), this, SLOT(signals_changed())); - connect(&_session, SIGNAL(data_updated()), + connect(&_session, SIGNAL(data_received()), + this, SLOT(data_updated())); + connect(&_session, SIGNAL(frame_ended()), this, SLOT(data_updated())); connect(_cursors.first().get(), SIGNAL(time_changed()), @@ -120,6 +120,10 @@ View::View(SigSession &session, QWidget *parent) : _viewport->installEventFilter(this); _ruler->installEventFilter(this); _header->installEventFilter(this); + + // Trigger the initial event manually. The default device has signals + // which were created before this object came into being + signals_changed(); } SigSession& View::session() @@ -154,38 +158,14 @@ void View::zoom(double steps) void View::zoom(double steps, int offset) { - const double new_scale = max(min(_scale * pow(3.0/2.0, -steps), - MaxScale), MinScale); - set_zoom(new_scale, offset); + set_zoom(_scale * pow(3.0/2.0, -steps), offset); } void View::zoom_fit() { - using pv::data::SignalData; - - const vector< shared_ptr > sigs( - session().get_signals()); - - // Make a set of all the visible data objects - set< shared_ptr > visible_data; - BOOST_FOREACH(const shared_ptr sig, sigs) - if (sig->enabled()) - visible_data.insert(sig->data()); - - if (visible_data.empty()) - return; - - double left_time = DBL_MAX, right_time = DBL_MIN; - BOOST_FOREACH(const shared_ptr d, visible_data) - { - const double start_time = d->get_start_time(); - left_time = min(left_time, start_time); - right_time = max(right_time, start_time + - d->get_max_sample_count() / d->samplerate()); - } - - assert(left_time < right_time); - if (right_time - left_time < 1e-12) + const pair extents = get_time_extents(); + const double delta = extents.second - extents.first; + if (delta < 1e-12) return; assert(_viewport); @@ -193,7 +173,8 @@ void View::zoom_fit() if (w <= 0) return; - set_scale_offset((right_time - left_time) / w, left_time); + const double scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale, extents.first); } void View::zoom_one_to_one() @@ -204,16 +185,12 @@ void View::zoom_one_to_one() session().get_signals()); // Make a set of all the visible data objects - set< shared_ptr > visible_data; - BOOST_FOREACH(const shared_ptr sig, sigs) - if (sig->enabled()) - visible_data.insert(sig->data()); - + set< shared_ptr > visible_data = get_visible_data(); if (visible_data.empty()) return; double samplerate = 0.0; - BOOST_FOREACH(const shared_ptr d, visible_data) { + for (const shared_ptr d : visible_data) { assert(d); samplerate = max(samplerate, d->samplerate()); } @@ -253,7 +230,7 @@ vector< shared_ptr > View::get_traces() const vector< shared_ptr > traces(sigs.size()); #endif - vector< shared_ptr >::iterator i = traces.begin(); + auto i = traces.begin(); i = copy(sigs.begin(), sigs.end(), i); #ifdef ENABLE_DECODE i = copy(decode_sigs.begin(), decode_sigs.end(), i); @@ -269,7 +246,7 @@ list > View::selected_items() const // List the selected signals const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH (shared_ptr t, traces) { + for (shared_ptr t : traces) { assert(t); if (t->selected()) items.push_back(t); @@ -284,6 +261,42 @@ list > View::selected_items() const return items; } +set< shared_ptr > View::get_visible_data() const +{ + const vector< shared_ptr > sigs( + session().get_signals()); + + // Make a set of all the visible data objects + set< shared_ptr > visible_data; + for (const shared_ptr sig : sigs) + if (sig->enabled()) + visible_data.insert(sig->data()); + + return visible_data; +} + +pair View::get_time_extents() const +{ + const set< shared_ptr > visible_data = get_visible_data(); + if (visible_data.empty()) + return make_pair(0.0, 0.0); + + double left_time = DBL_MAX, right_time = DBL_MIN; + for (const shared_ptr d : visible_data) + { + const double start_time = d->get_start_time(); + double samplerate = d->samplerate(); + samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; + + left_time = min(left_time, start_time); + right_time = max(right_time, start_time + + d->get_max_sample_count() / samplerate); + } + + assert(left_time < right_time); + return make_pair(left_time, right_time); +} + bool View::cursors_shown() const { return _show_cursors; @@ -325,11 +338,11 @@ void View::normalize_layout() const vector< shared_ptr > traces(get_traces()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr t, traces) + for (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 t, traces) + for (shared_ptr t : traces) t->set_v_offset(t->get_v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); @@ -344,11 +357,8 @@ void View::update_viewport() void View::get_scroll_layout(double &length, double &offset) const { - const shared_ptr sig_data = _session.get_data(); - if (!sig_data) - return; - - length = _data_length / (sig_data->samplerate() * _scale); + const pair extents = get_time_extents(); + length = (extents.second - extents.first) / _scale; offset = _offset / _scale; } @@ -487,7 +497,7 @@ void View::signals_changed() { int offset = SignalMargin + SignalHeight; const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { + for (shared_ptr t : traces) { t->set_view(this); t->set_v_offset(offset); offset += SignalHeight + 2 * SignalMargin; @@ -499,18 +509,6 @@ void View::signals_changed() void View::data_updated() { - // Get the new data length - _data_length = 0; - shared_ptr sig_data = _session.get_data(); - if (sig_data) { - deque< shared_ptr > &snapshots = - sig_data->get_snapshots(); - BOOST_FOREACH(shared_ptr s, snapshots) - if (s) - _data_length = max(_data_length, - s->get_sample_count()); - } - // Update the scroll bars update_scroll();