X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=29c0675d63b5ca1f2db20da4008e88083c8ac110;hp=1e4f07aa3ddab2fa3f0861881c5b50709e1e75f7;hb=fb64180193664005567570724d52b685913e15ed;hpb=be843692f664e44d26458063042cc5d41a13df57

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 1e4f07aa..29c0675d 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -178,6 +178,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	// 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);
 
@@ -320,6 +321,11 @@ void View::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 }
 #endif
 
+shared_ptr<Signal> View::get_signal_under_mouse_cursor() const
+{
+	return signal_under_mouse_cursor_;
+}
+
 View* View::view()
 {
 	return this;
@@ -853,6 +859,46 @@ const QPoint& View::hover_point() const
 	return hover_point_;
 }
 
+int64_t View::get_nearest_level_change(const QPoint &p) const
+{
+	if (snap_distance_ == 0)
+		return -1;
+
+	shared_ptr<Signal> signal = signal_under_mouse_cursor_;
+
+	if (!signal)
+		return -1;
+
+	// Calculate sample number from cursor position
+	const double samples_per_pixel = 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);
+
+	// Query for nearest level changes
+	vector<data::LogicSegment::EdgePair> edges =
+		signal->get_nearest_level_changes(sample_num);
+
+	if (edges.size() != 2)
+		return -1;
+
+	// 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;
+
+	const int64_t left_delta = left_sample_delta / samples_per_pixel;
+	const int64_t right_delta = right_sample_delta / samples_per_pixel;
+
+	int64_t nearest = -1;
+
+	// 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;
+
+	return nearest;
+}
+
 void View::restack_all_trace_tree_items()
 {
 	// Make a list of owners that is sorted from deepest first
@@ -875,10 +921,20 @@ void View::restack_all_trace_tree_items()
 		i->animate_to_layout_v_offset();
 }
 
+int View::header_width() const
+{
+	 return header_->extended_size_hint().width();
+}
+
 void View::on_setting_changed(const QString &key, const QVariant &value)
 {
 	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)
@@ -1087,12 +1143,11 @@ void View::set_scroll_default()
 void View::determine_if_header_was_shrunk()
 {
 	const int header_pane_width = splitter_->sizes().front();
-	const int header_width = header_->extended_size_hint().width();
 
 	// Allow for a slight margin of error so that we also accept
 	// slight differences when e.g. a label name change increased
 	// the overall width
-	header_was_shrunk_ = (header_pane_width < (header_width - 10));
+	header_was_shrunk_ = (header_pane_width < (header_width() - 10));
 }
 
 void View::resize_header_to_fit()
@@ -1276,11 +1331,24 @@ void View::resizeEvent(QResizeEvent* event)
 
 void View::update_hover_point()
 {
+	// Determine signal that the mouse cursor is hovering over
+	signal_under_mouse_cursor_.reset();
+	for (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)
 		r->hover_point_changed(hover_point_);
 
+	// Notify any other listeners
 	hover_point_changed(hover_point_);
 }