X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3b8508329cac79f1ee13fffd1e3f01d92844c9d9;hb=448a72cf7f0225eace2335ec05b979c4e9a6b882;hp=18ce679df877f030b2f35a11e208f9ef72e63bcd;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 18ce679d..3b850832 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,22 +22,25 @@ #include #endif -#include -#include -#include - -#include - -#include +#include +#include +#include +#include +#include #include #include #include +#include + +#include "cursorheader.h" #include "decodetrace.h" #include "header.h" +#include "logicsignal.h" #include "ruler.h" #include "signal.h" +#include "tracegroup.h" #include "view.h" #include "viewport.h" @@ -45,8 +48,24 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" -using namespace boost; -using namespace std; +using boost::shared_lock; +using boost::shared_mutex; +using pv::data::SignalData; +using std::back_inserter; +using std::deque; +using std::dynamic_pointer_cast; +using std::list; +using std::lock_guard; +using std::max; +using std::make_pair; +using std::min; +using std::pair; +using std::set; +using std::shared_ptr; +using std::unordered_map; +using std::unordered_set; +using std::vector; +using std::weak_ptr; namespace pv { namespace view { @@ -56,10 +75,6 @@ const double View::MinScale = 1e-15; const int View::MaxScrollValue = INT_MAX / 2; -const int View::SignalHeight = 30; -const int View::SignalMargin = 10; -const int View::SignalSnapGridSize = 10; - const QColor View::CursorAreaColour(220, 231, 243); const QSizeF View::LabelPadding(4, 0); @@ -69,8 +84,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 +101,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()), @@ -94,26 +113,40 @@ View::View(SigSession &session, QWidget *parent) : connect(_cursors.second().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(_header, SIGNAL(geometry_updated()), - this, SLOT(on_geometry_updated())); connect(_header, SIGNAL(signals_moved()), 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())); + + connect(&_lazy_event_handler, SIGNAL(timeout()), + this, SLOT(process_sticky_events())); + _lazy_event_handler.setSingleShot(true); + 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 +159,26 @@ const SigSession& View::session() const return _session; } +View* View::view() +{ + return this; +} + +const View* View::view() const +{ + return this; +} + +Viewport* View::viewport() +{ + return _viewport; +} + +const Viewport* View::viewport() const +{ + return _viewport; +} + double View::scale() const { return _scale; @@ -136,9 +189,14 @@ double View::offset() const return _offset; } -int View::v_offset() const +int View::owner_visual_v_offset() const +{ + return -_v_offset; +} + +unsigned int View::depth() const { - return _v_offset; + return 0; } void View::zoom(double steps) @@ -148,38 +206,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,27 +221,21 @@ 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() { 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()); - + 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,52 +258,45 @@ 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 +set< shared_ptr > View::get_visible_data() const { - const vector< shared_ptr > sigs( - session().get_signals()); -#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()); -#endif + shared_lock lock(session().signals_mutex()); + const vector< shared_ptr > &sigs(session().signals()); - 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 + // 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()); - stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); - return traces; + return visible_data; } -list > View::selected_items() const +pair View::get_time_extents() const { - list > items; + const set< shared_ptr > visible_data = get_visible_data(); + if (visible_data.empty()) + return make_pair(0.0, 0.0); - // 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); - } + 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; - // List the selected cursors - if (_cursors.first()->selected()) - items.push_back(_cursors.first()); - if (_cursors.second()->selected()) - items.push_back(_cursors.second()); + left_time = min(left_time, start_time); + right_time = max(right_time, start_time + + d->get_max_sample_count() / samplerate); + } - return items; + assert(left_time < right_time); + return make_pair(left_time, right_time); } bool View::cursors_shown() const @@ -286,7 +307,7 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { _show_cursors = show; - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -295,7 +316,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(); } @@ -314,35 +335,39 @@ const QPoint& View::hover_point() const return _hover_point; } -void View::normalize_layout() +void View::update_viewport() { - const vector< shared_ptr > traces(get_traces()); + assert(_viewport); + _viewport->update(); + _header->update(); +} - int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr t, traces) - v_min = min(t->get_v_offset(), v_min); +void View::restack_all_row_items() +{ + // Make a set of owners + unordered_set< RowItemOwner* > owners; + for (const auto &r : *this) + owners.insert(r->owner()); - const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr t, traces) - t->set_v_offset(t->get_v_offset() + delta); + // Make a list that is sorted from deepest first + vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end()); + sort(sorted_owners.begin(), sorted_owners.end(), + [](const RowItemOwner* a, const RowItemOwner *b) { + return a->depth() > b->depth(); }); - verticalScrollBar()->setSliderPosition(_v_offset + delta); - v_scroll_value_changed(verticalScrollBar()->sliderPosition()); -} + // Restack the items recursively + for (auto &o : sorted_owners) + o->restack_items(); -void View::update_viewport() -{ - assert(_viewport); - _viewport->update(); + // Animate the items to their destination + for (const auto &r : *this) + r->animate_to_layout_v_offset(); } 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; } @@ -382,28 +407,79 @@ void View::update_scroll() // Set the vertical scrollbar verticalScrollBar()->setPageStep(areaSize.height()); - verticalScrollBar()->setRange(0, - _viewport->get_total_height() + SignalMargin - - areaSize.height()); + + const pair extents = v_extents(); + const int extra_scroll_height = (extents.second - extents.first) / 4; + verticalScrollBar()->setRange(extents.first - extra_scroll_height, + extents.first + extra_scroll_height); } 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) +void View::paint_label(QPainter &p, int right, bool hover) +{ + (void)p; + (void)right; + (void)hover; +} + +QRectF View::label_rect(int right) { - assert(a); - assert(b); - return a->get_v_offset() < b->get_v_offset(); + (void)right; + return QRectF(); +} + +bool View::add_channels_to_owner( + const vector< shared_ptr > &channels, + RowItemOwner *owner, int &offset, + unordered_map, shared_ptr > + &signal_map, + std::function)> filter_func) +{ + bool any_added = false; + + assert(owner); + + for (const auto &channel : channels) + { + const auto iter = signal_map.find(channel); + if (iter == signal_map.end() || + (filter_func && !filter_func((*iter).second))) + continue; + + shared_ptr row_item = (*iter).second; + owner->add_child_item(row_item); + apply_offset(row_item, offset); + signal_map.erase(iter); + + any_added = true; + } + + return any_added; +} + +void View::apply_offset(shared_ptr row_item, int &offset) { + assert(row_item); + const pair extents = row_item->v_extents(); + if (row_item->enabled()) + offset += -extents.first; + row_item->force_to_v_offset(offset); + if (row_item->enabled()) + offset += extents.second; } bool View::eventFilter(QObject *object, QEvent *event) @@ -414,7 +490,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 +516,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: @@ -452,6 +531,22 @@ void View::resizeEvent(QResizeEvent*) update_layout(); } +void View::appearance_changed(bool label, bool content) +{ + if (label) + _header->update(); + if (content) + _viewport->update(); +} + +void View::extents_changed(bool horz, bool vert) +{ + _sticky_events |= + (horz ? SelectableItemHExtentsChanged : 0) | + (vert ? SelectableItemVExtentsChanged : 0); + _lazy_event_handler.start(); +} + void View::h_scroll_value_changed(int value) { if (_updating_scroll) @@ -467,6 +562,7 @@ void View::h_scroll_value_changed(int value) } _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -479,32 +575,76 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { - int offset = SignalMargin + SignalHeight; - const vector< shared_ptr > traces(get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { - t->set_view(this); - t->set_v_offset(offset); - offset += SignalHeight + 2 * SignalMargin; + int offset = 0; + + // Populate the traces + clear_child_items(); + + shared_ptr device = _session.device(); + assert(device); + + // Collect a set of signals + unordered_map, shared_ptr > + signal_map; + + shared_lock lock(_session.signals_mutex()); + const vector< shared_ptr > &sigs(_session.signals()); + + for (const shared_ptr &sig : sigs) + signal_map[sig->channel()] = sig; + + // Populate channel groups + for (auto entry : device->channel_groups()) + { + const shared_ptr &group = entry.second; + + if (group->channels().size() <= 1) + continue; + + shared_ptr trace_group(new TraceGroup()); + int child_offset = 0; + if (add_channels_to_owner(group->channels(), + trace_group.get(), child_offset, signal_map)) + { + add_child_item(trace_group); + apply_offset(trace_group, offset); + } } + // Add the remaining logic channels + shared_ptr logic_trace_group(new TraceGroup()); + int child_offset = 0; + + if (add_channels_to_owner(device->channels(), + logic_trace_group.get(), child_offset, signal_map, + [](shared_ptr r) -> bool { + return dynamic_pointer_cast(r) != nullptr; + })) + + { + add_child_item(logic_trace_group); + apply_offset(logic_trace_group, offset); + } + + // Add the remaining channels + add_channels_to_owner(device->channels(), this, offset, signal_map); + assert(signal_map.empty()); + + // Add decode signals +#ifdef ENABLE_DECODE + const vector< shared_ptr > decode_sigs( + session().get_decode_signals()); + for (auto s : decode_sigs) { + add_child_item(s); + apply_offset(s, offset); + } +#endif + update_layout(); - normalize_layout(); } 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 +654,7 @@ void View::data_updated() void View::marker_time_changed() { - _ruler->update(); + _cursorheader->update(); _viewport->update(); } @@ -524,9 +664,21 @@ void View::on_signals_moved() signals_moved(); } -void View::on_geometry_updated() +void View::process_sticky_events() { - update_layout(); + if (_sticky_events & SelectableItemHExtentsChanged) + update_layout(); + if (_sticky_events & SelectableItemVExtentsChanged) + restack_all_row_items(); + + // Clear the sticky events + _sticky_events = 0; +} + +void View::on_hover_point_changed() +{ + for (shared_ptr r : *this) + r->hover_point_changed(); } } // namespace view