X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3b8508329cac79f1ee13fffd1e3f01d92844c9d9;hb=448a72cf7f0225eace2335ec05b979c4e9a6b882;hp=2cb3f3ed9b6f3dd1f2591b94911b150004f4ba94;hpb=1ef49ddd04f44a4369403fbab19ed235483e2975;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 2cb3f3ed..3b850832 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,19 +22,25 @@ #include #endif -#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" @@ -42,16 +48,22 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" +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; @@ -63,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); @@ -105,8 +113,6 @@ 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())); @@ -123,6 +129,10 @@ View::View(SigSession &session, QWidget *parent) : 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); @@ -149,6 +159,16 @@ const SigSession& View::session() const return _session; } +View* View::view() +{ + return this; +} + +const View* View::view() const +{ + return this; +} + Viewport* View::viewport() { return _viewport; @@ -169,11 +189,16 @@ 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 0; +} + void View::zoom(double steps) { zoom(steps, _viewport->width() / 2); @@ -204,9 +229,6 @@ 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 = get_visible_data(); if (visible_data.empty()) @@ -241,52 +263,10 @@ void View::set_scale_offset(double scale, double offset) 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()); - copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces)); -#endif - - stable_sort(traces.begin(), traces.end(), - [](const shared_ptr &a, const shared_ptr &b) { - return a->v_offset() < b->v_offset(); }); - - return traces; -} - -list > View::selected_items() const -{ - list > items; - - // List the selected signals - const vector< shared_ptr > traces(get_traces()); - for (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; -} - set< shared_ptr > View::get_visible_data() const { - const vector< shared_ptr > sigs( - session().get_signals()); + shared_lock lock(session().signals_mutex()); + const vector< shared_ptr > &sigs(session().signals()); // Make a set of all the visible data objects set< shared_ptr > visible_data; @@ -355,26 +335,33 @@ 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; - for (const shared_ptr t : traces) - v_min = min(t->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); - for (shared_ptr t : traces) - t->set_v_offset(t->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 @@ -420,9 +407,11 @@ 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() @@ -441,6 +430,58 @@ void View::update_layout() update_scroll(); } +void View::paint_label(QPainter &p, int right, bool hover) +{ + (void)p; + (void)right; + (void)hover; +} + +QRectF View::label_rect(int right) +{ + (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) { const QEvent::Type type = event->type(); @@ -490,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) @@ -518,16 +575,72 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { - int offset = SignalMargin + SignalHeight; - const vector< shared_ptr > traces(get_traces()); - for (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() @@ -551,16 +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() { - const vector< shared_ptr > traces(get_traces()); - for (shared_ptr t : traces) - t->hover_point_changed(); + for (shared_ptr r : *this) + r->hover_point_changed(); } } // namespace view