X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=2cb3f3ed9b6f3dd1f2591b94911b150004f4ba94;hb=18f7104f875a71bceeb152398b682737528a4ad7;hp=18ce679df877f030b2f35a11e208f9ef72e63bcd;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 18ce679d..2cb3f3ed 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -26,14 +26,11 @@ #include #include -#include - -#include - #include #include #include +#include "cursorheader.h" #include "decodetrace.h" #include "header.h" #include "ruler.h" @@ -45,8 +42,18 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" -using namespace boost; -using namespace std; +using pv::data::SignalData; +using std::back_inserter; +using std::deque; +using std::list; +using std::max; +using std::make_pair; +using std::min; +using std::pair; +using std::set; +using std::shared_ptr; +using std::vector; +using std::weak_ptr; namespace pv { namespace view { @@ -69,8 +76,8 @@ View::View(SigSession &session, QWidget *parent) : _session(session), _viewport(new Viewport(*this)), _ruler(new Ruler(*this)), + _cursorheader(new CursorHeader(*this)), _header(new Header(*this)), - _data_length(0), _scale(1e-6), _offset(0), _v_offset(0), @@ -86,7 +93,11 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(signals_changed()), this, SLOT(signals_changed())); - connect(&_session, SIGNAL(data_updated()), + connect(&_session, SIGNAL(capture_state_changed(int)), + this, SLOT(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()), @@ -100,20 +111,32 @@ View::View(SigSession &session, QWidget *parent) : this, SLOT(on_signals_moved())); connect(_header, SIGNAL(selection_changed()), - _ruler, SLOT(clear_selection())); - connect(_ruler, SIGNAL(selection_changed()), + _cursorheader, SLOT(clear_selection())); + connect(_cursorheader, SIGNAL(selection_changed()), _header, SLOT(clear_selection())); connect(_header, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); - connect(_ruler, SIGNAL(selection_changed()), + connect(_cursorheader, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); + connect(this, SIGNAL(hover_point_changed()), + this, SLOT(on_hover_point_changed())); + setViewport(_viewport); _viewport->installEventFilter(this); _ruler->installEventFilter(this); + _cursorheader->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(); + + // make sure the transparent widgets are on the top + _cursorheader->raise(); + _header->raise(); } SigSession& View::session() @@ -126,6 +149,16 @@ const SigSession& View::session() const return _session; } +Viewport* View::viewport() +{ + return _viewport; +} + +const Viewport* View::viewport() const +{ + return _viewport; +} + double View::scale() const { return _scale; @@ -138,7 +171,7 @@ double View::offset() const int View::v_offset() const { - return _v_offset; + return -_v_offset; } void View::zoom(double steps) @@ -148,38 +181,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); @@ -187,7 +196,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() @@ -198,16 +208,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()); } @@ -230,30 +236,29 @@ void View::set_scale_offset(double scale, double offset) update_scroll(); _ruler->update(); + _cursorheader->update(); _viewport->update(); scale_offset_changed(); } vector< shared_ptr > View::get_traces() const { + vector< shared_ptr > traces; + const vector< shared_ptr > sigs( session().get_signals()); + copy(sigs.begin(), sigs.end(), back_inserter(traces)); + #ifdef ENABLE_DECODE const vector< shared_ptr > decode_sigs( session().get_decode_signals()); - vector< shared_ptr > traces( - sigs.size() + decode_sigs.size()); -#else - vector< shared_ptr > traces(sigs.size()); + copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces)); #endif - vector< shared_ptr >::iterator i = traces.begin(); - i = copy(sigs.begin(), sigs.end(), i); -#ifdef ENABLE_DECODE - i = copy(decode_sigs.begin(), decode_sigs.end(), i); -#endif + stable_sort(traces.begin(), traces.end(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->v_offset() < b->v_offset(); }); - stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); return traces; } @@ -263,7 +268,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); @@ -278,6 +283,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; @@ -286,7 +327,7 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { _show_cursors = show; - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -295,7 +336,7 @@ 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(); + _cursorheader->update(); _viewport->update(); } @@ -319,12 +360,12 @@ void View::normalize_layout() const vector< shared_ptr > traces(get_traces()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr t, traces) - v_min = min(t->get_v_offset(), v_min); + for (const shared_ptr t : traces) + v_min = min(t->v_offset(), v_min); const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr t, traces) - t->set_v_offset(t->get_v_offset() + delta); + for (shared_ptr t : traces) + t->set_v_offset(t->v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); v_scroll_value_changed(verticalScrollBar()->sliderPosition()); @@ -338,11 +379,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; } @@ -389,23 +427,20 @@ void View::update_scroll() void View::update_layout() { - setViewportMargins(_header->sizeHint().width(), + setViewportMargins( + _header->sizeHint().width() - pv::view::Header::BaselineOffset, _ruler->sizeHint().height(), 0, 0); _ruler->setGeometry(_viewport->x(), 0, _viewport->width(), _viewport->y()); + _cursorheader->setGeometry( + _viewport->x(), + _ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2, + _viewport->width(), _cursorheader->sizeHint().height()); _header->setGeometry(0, _viewport->y(), - _viewport->x(), _viewport->height()); + _header->sizeHint().width(), _viewport->height()); update_scroll(); } -bool View::compare_trace_v_offsets(const shared_ptr &a, - const shared_ptr &b) -{ - assert(a); - assert(b); - return a->get_v_offset() < b->get_v_offset(); -} - bool View::eventFilter(QObject *object, QEvent *event) { const QEvent::Type type = event->type(); @@ -414,7 +449,7 @@ bool View::eventFilter(QObject *object, QEvent *event) const QMouseEvent *const mouse_event = (QMouseEvent*)event; if (object == _viewport) _hover_point = mouse_event->pos(); - else if (object == _ruler) + else if (object == _ruler || object == _cursorheader) _hover_point = QPoint(mouse_event->x(), 0); else if (object == _header) _hover_point = QPoint(0, mouse_event->y()); @@ -440,6 +475,9 @@ bool View::viewportEvent(QEvent *e) case QEvent::MouseButtonDblClick: case QEvent::MouseMove: case QEvent::Wheel: + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: return false; default: @@ -467,6 +505,7 @@ void View::h_scroll_value_changed(int value) } _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -481,7 +520,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; @@ -493,18 +532,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(); @@ -514,7 +541,7 @@ void View::data_updated() void View::marker_time_changed() { - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -529,5 +556,12 @@ void View::on_geometry_updated() update_layout(); } +void View::on_hover_point_changed() +{ + const vector< shared_ptr > traces(get_traces()); + for (shared_ptr t : traces) + t->hover_point_changed(); +} + } // namespace view } // namespace pv