X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=fa911f0b5ad92ae8a27c0f96b3d69de2de984aab;hp=b8bbe35798825b1c1ff129fd5bae798f55219ddc;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=fc1df2df99c8ac41269ffba5966fcbb9a2e28479 diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index b8bbe357..fa911f0b 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -79,6 +79,7 @@ using std::max; using std::make_pair; using std::make_shared; using std::min; +using std::numeric_limits; using std::pair; using std::set; using std::set_difference; @@ -240,6 +241,7 @@ void View::reset_view_state() cursors_ = make_shared(*this); next_flag_text_ = 'A'; trigger_markers_.clear(); + hover_widget_ = nullptr; hover_point_ = QPoint(-1, -1); scroll_needs_defaults_ = true; saved_v_offset_ = 0; @@ -346,6 +348,11 @@ const Viewport* View::viewport() const return viewport_; } +const Ruler* View::ruler() const +{ + return ruler_; +} + void View::save_settings(QSettings &settings) const { settings.setValue("scale", scale_); @@ -368,7 +375,7 @@ void View::save_settings(QSettings &settings) const settings.setValue("offset", QString::fromStdString(ss.str())); } - for (shared_ptr signal : signals_) { + for (const shared_ptr& signal : signals_) { settings.beginGroup(signal->base()->internal_name()); signal->save_settings(settings); settings.endGroup(); @@ -450,7 +457,7 @@ vector< shared_ptr > View::time_items() const items.push_back(cursors_->second()); } - for (auto trigger_marker : trigger_markers_) + for (auto& trigger_marker : trigger_markers_) items.push_back(trigger_marker); return items; @@ -589,10 +596,10 @@ void View::set_current_segment(uint32_t segment_id) { current_segment_ = segment_id; - for (shared_ptr signal : signals_) + for (const shared_ptr& signal : signals_) signal->set_current_segment(current_segment_); #ifdef ENABLE_DECODE - for (shared_ptr dt : decode_traces_) + for (shared_ptr& dt : decode_traces_) dt->set_current_segment(current_segment_); #endif @@ -628,7 +635,7 @@ void View::set_segment_display_mode(Trace::SegmentDisplayMode mode) { segment_display_mode_ = mode; - for (shared_ptr signal : signals_) + for (const shared_ptr& signal : signals_) signal->set_segment_display_mode(mode); uint32_t last_segment = session_.get_segment_count() - 1; @@ -737,7 +744,7 @@ set< shared_ptr > View::get_visible_data() const { // Make a set of all the visible data objects set< shared_ptr > visible_data; - for (const shared_ptr sig : signals_) + for (const shared_ptr& sig : signals_) if (sig->enabled()) visible_data.insert(sig->data()); @@ -748,9 +755,9 @@ pair View::get_time_extents() const { boost::optional left_time, right_time; const set< shared_ptr > visible_data = get_visible_data(); - for (const shared_ptr d : visible_data) { + for (const shared_ptr& d : visible_data) { const vector< shared_ptr > segments = d->segments(); - for (const shared_ptr &s : segments) { + for (const shared_ptr& s : segments) { double samplerate = s->samplerate(); samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; @@ -859,44 +866,110 @@ const QPoint& View::hover_point() const return hover_point_; } -int64_t View::get_nearest_level_change(const QPoint &p) const +const QWidget* View::hover_widget() const +{ + return hover_widget_; +} + +int64_t View::get_nearest_level_change(const QPoint &p) { + // Is snapping disabled? if (snap_distance_ == 0) return -1; - shared_ptr signal = signal_under_mouse_cursor_; + struct entry_t { + entry_t(shared_ptr s) : + signal(s), delta(numeric_limits::max()), sample(-1), is_dense(false) {} + shared_ptr signal; + int64_t delta; + int64_t sample; + bool is_dense; + }; - if (!signal) - return -1; + vector list; - // Calculate sample number from cursor position - const double samples_per_pixel = signal->base()->get_samplerate() * scale(); - const int64_t x_offset = offset().convert_to() / scale(); - const int64_t sample_num = max(((x_offset + p.x()) * samples_per_pixel), 0.0); + // Create list of signals to consider + if (signal_under_mouse_cursor_) + list.emplace_back(signal_under_mouse_cursor_); + else + for (shared_ptr s : signals_) { + if (!s->enabled()) + continue; - // Query for nearest level changes - vector edges = - signal->get_nearest_level_changes(sample_num); + list.emplace_back(s); + } - if (edges.size() != 2) - return -1; + // Get data for listed signals + for (entry_t &e : list) { + // Calculate sample number from cursor position + const double samples_per_pixel = e.signal->base()->get_samplerate() * scale(); + const int64_t x_offset = offset().convert_to() / scale(); + const int64_t sample_num = max(((x_offset + p.x()) * samples_per_pixel), 0.0); + + vector edges = + e.signal->get_nearest_level_changes(sample_num); + + if (edges.empty()) + continue; + + // Check first edge + const int64_t first_sample_delta = abs(sample_num - edges.front().first); + const int64_t first_delta = first_sample_delta / samples_per_pixel; + e.delta = first_delta; + e.sample = edges.front().first; + + // Check second edge if available + if (edges.size() == 2) { + // Note: -1 because this is usually the right edge and sample points are left-aligned + const int64_t second_sample_delta = abs(sample_num - edges.back().first - 1); + const int64_t second_delta = second_sample_delta / samples_per_pixel; + + // If both edges are too close, we mark this signal as being dense + if ((first_delta + second_delta) <= snap_distance_) + e.is_dense = true; + + if (second_delta < first_delta) { + e.delta = second_delta; + e.sample = edges.back().first; + } + } + } - // We received absolute sample numbers, make them relative - const int64_t left_sample_delta = sample_num - edges.front().first; - const int64_t right_sample_delta = edges.back().first - sample_num - 1; + // Look for the best match: non-dense first, then dense + entry_t *match = nullptr; - const int64_t left_delta = left_sample_delta / samples_per_pixel; - const int64_t right_delta = right_sample_delta / samples_per_pixel; + for (entry_t &e : list) { + if (e.delta > snap_distance_ || e.is_dense) + continue; - int64_t nearest = -1; + if (match) { + if (e.delta < match->delta) + match = &e; + } else + match = &e; + } - // Only use closest left or right edge if they're close to the cursor - if ((left_delta < right_delta) && (left_delta < snap_distance_)) - nearest = edges.front().first; - if ((left_delta >= right_delta) && (right_delta < snap_distance_)) - nearest = edges.back().first; + if (!match) { + for (entry_t &e : list) { + if (!e.is_dense) + continue; + + if (match) { + if (e.delta < match->delta) + match = &e; + } else + match = &e; + } + } - return nearest; + if (match) { + // Somewhat ugly hack to make TimeItem::drag_by() work + signal_under_mouse_cursor_ = match->signal; + + return match->sample; + } + + return -1; } void View::restack_all_trace_tree_items() @@ -1142,7 +1215,8 @@ void View::set_scroll_default() void View::determine_if_header_was_shrunk() { - const int header_pane_width = splitter_->sizes().front(); + const int header_pane_width = + splitter_->sizes().front(); // clazy:exclude=detaching-temporary // Allow for a slight margin of error so that we also accept // slight differences when e.g. a label name change increased @@ -1161,7 +1235,7 @@ void View::resize_header_to_fit() // splitter to the maximum allowed position. int splitter_area_width = 0; - for (int w : splitter_->sizes()) + for (int w : splitter_->sizes()) // clazy:exclude=range-loop splitter_area_width += w; // Make sure the header has enough horizontal space to show all labels fully @@ -1187,8 +1261,8 @@ TraceTreeItemOwner* View::find_prevalent_trace_group( vector owner_list; // Make a set and a list of all the owners - for (const auto &channel : group->channels()) { - for (auto entry : signal_map) { + for (const auto& channel : group->channels()) { + for (auto& entry : signal_map) { if (entry.first->channel() == channel) { TraceTreeItemOwner *const o = (entry.second)->owner(); owner_list.push_back(o); @@ -1221,8 +1295,8 @@ vector< shared_ptr > View::extract_new_traces_for_channels( { vector< shared_ptr > filtered_traces; - for (const auto &channel : channels) { - for (auto entry : signal_map) { + for (const auto& channel : channels) { + for (auto& entry : signal_map) { if (entry.first->channel() == channel) { shared_ptr trace = entry.second; const auto list_iter = add_list.find(trace); @@ -1243,7 +1317,7 @@ void View::determine_time_unit() // Check whether we know the sample rate and hence can use time as the unit if (time_unit_ == util::TimeUnit::Samples) { // Check all signals but... - for (const shared_ptr signal : signals_) { + for (const shared_ptr& signal : signals_) { const shared_ptr data = signal->data(); // ...only check first segment of each @@ -1262,14 +1336,14 @@ bool View::eventFilter(QObject *object, QEvent *event) const QEvent::Type type = event->type(); if (type == QEvent::MouseMove) { + if (object) + hover_widget_ = qobject_cast(object); + const QMouseEvent *const mouse_event = (QMouseEvent*)event; if (object == viewport_) hover_point_ = mouse_event->pos(); else if (object == ruler_) - // Adjust the hover point's y coordinate so that it's relative to - // the top of the viewport. The result may be negative. - hover_point_ = QPoint(mouse_event->pos().x(), - mouse_event->pos().y() - ruler_->sizeHint().height()); + hover_point_ = mouse_event->pos(); else if (object == header_) hover_point_ = QPoint(0, mouse_event->y()); else @@ -1320,7 +1394,7 @@ void View::contextMenuEvent(QContextMenuEvent *event) QMenu *menu = r->create_view_context_menu(this, pos); if (menu) - menu->exec(event->globalPos()); + menu->popup(event->globalPos()); } void View::resizeEvent(QResizeEvent* event) @@ -1336,23 +1410,25 @@ void View::update_hover_point() { // Determine signal that the mouse cursor is hovering over signal_under_mouse_cursor_.reset(); - for (shared_ptr s : signals_) { - const pair extents = s->v_extents(); - const int top = s->get_visual_y() + extents.first; - const int btm = s->get_visual_y() + extents.second; - if ((hover_point_.y() >= top) && (hover_point_.y() <= btm) - && s->base()->enabled()) - signal_under_mouse_cursor_ = s; + if (hover_widget_ == this) { + for (const shared_ptr& s : signals_) { + const pair extents = s->v_extents(); + const int top = s->get_visual_y() + extents.first; + const int btm = s->get_visual_y() + extents.second; + if ((hover_point_.y() >= top) && (hover_point_.y() <= btm) + && s->base()->enabled()) + signal_under_mouse_cursor_ = s; + } } // Update all trace tree items const vector> trace_tree_items( list_by_type()); - for (shared_ptr r : trace_tree_items) + for (const shared_ptr& r : trace_tree_items) r->hover_point_changed(hover_point_); // Notify any other listeners - hover_point_changed(hover_point_); + hover_point_changed(hover_widget_, hover_point_); } void View::row_item_appearance_changed(bool label, bool content) @@ -1483,12 +1559,12 @@ void View::signals_changed() // Make a look-up table of sigrok Channels to pulseview Signals unordered_map, shared_ptr > signal_map; - for (const shared_ptr &sig : signals_) + for (const shared_ptr& sig : signals_) signal_map[sig->base()] = sig; // Populate channel groups if (sr_dev) - for (auto entry : sr_dev->channel_groups()) { + for (auto& entry : sr_dev->channel_groups()) { const shared_ptr &group = entry.second; if (group->channels().size() <= 1) @@ -1514,7 +1590,7 @@ void View::signals_changed() // Add the traces to the group const pair prev_v_extents = owner->v_extents(); int offset = prev_v_extents.second - prev_v_extents.first; - for (shared_ptr trace : new_traces_in_group) { + for (const shared_ptr& trace : new_traces_in_group) { assert(trace); owner->add_child_item(trace); @@ -1549,7 +1625,7 @@ void View::signals_changed() if (non_grouped_logic_signals.size() > 0) { const shared_ptr non_grouped_trace_group( make_shared()); - for (shared_ptr trace : non_grouped_logic_signals) + for (const shared_ptr& trace : non_grouped_logic_signals) non_grouped_trace_group->add_child_item(trace); non_grouped_trace_group->restack_items(); @@ -1567,7 +1643,7 @@ void View::signals_changed() add_traces.begin(), add_traces.end()); // Remove any removed traces - for (shared_ptr trace : remove_traces) { + for (const shared_ptr& trace : remove_traces) { TraceTreeItemOwner *const owner = trace->owner(); assert(owner); owner->remove_child_item(trace);