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;
// Set up settings and event handlers
GlobalSettings settings;
colored_bg_ = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
+ snap_distance_ = settings.value(GlobalSettings::Key_View_SnapDistance).toInt();
GlobalSettings::add_change_handler(this);
cursors_ = make_shared<CursorPair>(*this);
next_flag_text_ = 'A';
trigger_markers_.clear();
+ hover_widget_ = nullptr;
hover_point_ = QPoint(-1, -1);
scroll_needs_defaults_ = true;
saved_v_offset_ = 0;
}
#endif
+shared_ptr<Signal> View::get_signal_under_mouse_cursor() const
+{
+ return signal_under_mouse_cursor_;
+}
+
View* View::view()
{
return this;
return viewport_;
}
+const Ruler* View::ruler() const
+{
+ return ruler_;
+}
+
void View::save_settings(QSettings &settings) const
{
settings.setValue("scale", scale_);
settings.setValue("offset", QString::fromStdString(ss.str()));
}
- for (shared_ptr<Signal> signal : signals_) {
+ for (const shared_ptr<Signal>& signal : signals_) {
settings.beginGroup(signal->base()->internal_name());
signal->save_settings(settings);
settings.endGroup();
items.push_back(cursors_->second());
}
- for (auto trigger_marker : trigger_markers_)
+ for (auto& trigger_marker : trigger_markers_)
items.push_back(trigger_marker);
return items;
return ruler_offset_;
}
-void View::set_zero_position(pv::util::Timestamp& position)
+void View::set_zero_position(const pv::util::Timestamp& position)
{
- ruler_shift_ = -position;
+ // ruler shift is a negative offset and the new zero position is relative
+ // to the current offset. Hence, we adjust the ruler shift only by the
+ // difference.
+ ruler_shift_ = -(position + (-ruler_shift_));
// Force an immediate update of the offsets
set_offset(offset_, true);
{
current_segment_ = segment_id;
- for (shared_ptr<Signal> signal : signals_)
+ for (const shared_ptr<Signal>& signal : signals_)
signal->set_current_segment(current_segment_);
#ifdef ENABLE_DECODE
- for (shared_ptr<DecodeTrace> dt : decode_traces_)
+ for (shared_ptr<DecodeTrace>& dt : decode_traces_)
dt->set_current_segment(current_segment_);
#endif
{
segment_display_mode_ = mode;
- for (shared_ptr<Signal> signal : signals_)
+ for (const shared_ptr<Signal>& signal : signals_)
signal->set_segment_display_mode(mode);
uint32_t last_segment = session_.get_segment_count() - 1;
{
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
- for (const shared_ptr<Signal> sig : signals_)
+ for (const shared_ptr<Signal>& sig : signals_)
if (sig->enabled())
visible_data.insert(sig->data());
{
boost::optional<Timestamp> left_time, right_time;
const set< shared_ptr<SignalData> > visible_data = get_visible_data();
- for (const shared_ptr<SignalData> d : visible_data) {
+ for (const shared_ptr<SignalData>& d : visible_data) {
const vector< shared_ptr<Segment> > segments = d->segments();
- for (const shared_ptr<Segment> &s : segments) {
+ for (const shared_ptr<Segment>& s : segments) {
double samplerate = s->samplerate();
samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
return hover_point_;
}
+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;
+
+ struct entry_t {
+ entry_t(shared_ptr<Signal> s) :
+ signal(s), delta(numeric_limits<int64_t>::max()), sample(-1), is_dense(false) {}
+ shared_ptr<Signal> signal;
+ int64_t delta;
+ int64_t sample;
+ bool is_dense;
+ };
+
+ vector<entry_t> list;
+
+ // Create list of signals to consider
+ if (signal_under_mouse_cursor_)
+ list.emplace_back(signal_under_mouse_cursor_);
+ else
+ for (shared_ptr<Signal> s : signals_) {
+ if (!s->enabled())
+ continue;
+
+ list.emplace_back(s);
+ }
+
+ // 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<double>() / scale();
+ const int64_t sample_num = max(((x_offset + p.x()) * samples_per_pixel), 0.0);
+
+ vector<data::LogicSegment::EdgePair> 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;
+ }
+ }
+ }
+
+ // Look for the best match: non-dense first, then dense
+ entry_t *match = nullptr;
+
+ for (entry_t &e : list) {
+ if (e.delta > snap_distance_ || e.is_dense)
+ continue;
+
+ if (match) {
+ if (e.delta < match->delta)
+ match = &e;
+ } else
+ match = &e;
+ }
+
+ if (!match) {
+ for (entry_t &e : list) {
+ if (!e.is_dense)
+ continue;
+
+ if (match) {
+ if (e.delta < match->delta)
+ match = &e;
+ } else
+ match = &e;
+ }
+ }
+
+ 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()
{
// Make a list of owners that is sorted from deepest first
{
if (key == GlobalSettings::Key_View_TriggerIsZeroTime)
on_settingViewTriggerIsZeroTime_changed(value);
+
+ if (key == GlobalSettings::Key_View_SnapDistance) {
+ GlobalSettings settings;
+ snap_distance_ = settings.value(GlobalSettings::Key_View_SnapDistance).toInt();
+ }
}
void View::trigger_event(int segment_id, util::Timestamp location)
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
// 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
vector<TraceTreeItemOwner*> 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);
{
vector< shared_ptr<Trace> > 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> trace = entry.second;
const auto list_iter = add_list.find(trace);
// 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> signal : signals_) {
+ for (const shared_ptr<Signal>& signal : signals_) {
const shared_ptr<SignalData> data = signal->data();
// ...only check first segment of each
const QEvent::Type type = event->type();
if (type == QEvent::MouseMove) {
+ if (object)
+ hover_widget_ = qobject_cast<QWidget*>(object);
+
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
if (object == viewport_)
hover_point_ = mouse_event->pos();
else if (object == ruler_)
- hover_point_ = QPoint(mouse_event->x(), 0);
+ hover_point_ = mouse_event->pos();
else if (object == header_)
hover_point_ = QPoint(0, mouse_event->y());
else
QMenu *menu = r->create_view_context_menu(this, pos);
if (menu)
- menu->exec(event->globalPos());
+ menu->popup(event->globalPos());
}
void View::resizeEvent(QResizeEvent* event)
void View::update_hover_point()
{
+ // Determine signal that the mouse cursor is hovering over
+ signal_under_mouse_cursor_.reset();
+ if (hover_widget_ == this) {
+ for (const shared_ptr<Signal>& s : signals_) {
+ const pair<int, int> 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<shared_ptr<TraceTreeItem>> trace_tree_items(
list_by_type<TraceTreeItem>());
- for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+ for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)
r->hover_point_changed(hover_point_);
- hover_point_changed(hover_point_);
+ // Notify any other listeners
+ hover_point_changed(hover_widget_, hover_point_);
}
void View::row_item_appearance_changed(bool label, bool content)
// Make a look-up table of sigrok Channels to pulseview Signals
unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
signal_map;
- for (const shared_ptr<Signal> &sig : signals_)
+ for (const shared_ptr<Signal>& 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<sigrok::ChannelGroup> &group = entry.second;
if (group->channels().size() <= 1)
// Add the traces to the group
const pair<int, int> prev_v_extents = owner->v_extents();
int offset = prev_v_extents.second - prev_v_extents.first;
- for (shared_ptr<Trace> trace : new_traces_in_group) {
+ for (const shared_ptr<Trace>& trace : new_traces_in_group) {
assert(trace);
owner->add_child_item(trace);
if (non_grouped_logic_signals.size() > 0) {
const shared_ptr<TraceGroup> non_grouped_trace_group(
make_shared<TraceGroup>());
- for (shared_ptr<Trace> trace : non_grouped_logic_signals)
+ for (const shared_ptr<Trace>& trace : non_grouped_logic_signals)
non_grouped_trace_group->add_child_item(trace);
non_grouped_trace_group->restack_items();
add_traces.begin(), add_traces.end());
// Remove any removed traces
- for (shared_ptr<Trace> trace : remove_traces) {
+ for (const shared_ptr<Trace>& trace : remove_traces) {
TraceTreeItemOwner *const owner = trace->owner();
assert(owner);
owner->remove_child_item(trace);