X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.cpp;h=6a9bf432a07157c2a2e7713e60dbd7972c8abd8f;hp=438e4e21c1f6a6c639543897cb65f35362e9a746;hb=eeceee9955e7db4ac777d49d1b7a766069476b08;hpb=b4bc9b55381ff22196785291d3862c8c8c131885

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 438e4e2..6a9bf43 100644
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -57,6 +57,8 @@ using sigrok::Trigger;
 using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
+using pv::data::LogicSegment;
+
 namespace pv {
 namespace views {
 namespace trace {
@@ -181,7 +183,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 	const float high_offset = y - signal_height_ + 0.5f;
 	const float low_offset = y + 0.5f;
 
-	shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
+	shared_ptr<LogicSegment> segment = get_logic_segment_to_paint();
 	if (!segment || (segment->get_sample_count() == 0))
 		return;
 
@@ -320,49 +322,31 @@ void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 	}
 }
 
-void LogicSignal::hover_point_changed(const QPoint &hp)
+vector<LogicSegment::EdgePair> LogicSignal::get_nearest_level_changes(uint64_t sample_pos)
 {
-	Signal::hover_point_changed(hp);
-
 	assert(base_);
 	assert(owner_);
 
-	if ((!base_->enabled()) || (hp.x() == 0))
-		return;
-
-	// Ignore if mouse cursor is not hovering over this trace
-	const int y = get_visual_y();
-	const pair<int, int> extents = v_extents();
-	if ((hp.y() < (y + extents.first)) || ((hp.y() > (y + extents.second))))
-		return;
+	if (sample_pos == 0)
+		return vector<LogicSegment::EdgePair>();
 
-	shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
+	shared_ptr<LogicSegment> segment = get_logic_segment_to_paint();
 	if (!segment || (segment->get_sample_count() == 0))
-		return;
-
-	double samplerate = segment->samplerate();
-
-	// Show sample rate as 1Hz when it is unknown
-	if (samplerate == 0.0)
-		samplerate = 1.0;
+		return vector<LogicSegment::EdgePair>();
 
 	const View *view = owner_->view();
 	assert(view);
-	const double scale = view->scale();
-	const double pixels_offset =
-		((view->offset() - segment->start_time()) / scale).convert_to<double>();
-	const double samples_per_pixel = samplerate * scale;
-
-	const uint64_t sample_pos = (uint64_t)max(
-		(hp.x() + pixels_offset) * samples_per_pixel, 0.0);
+	const double samples_per_pixel = base_->get_samplerate() * view->scale();
 
-	vector<data::LogicSegment::EdgePair> edges;
+	vector<LogicSegment::EdgePair> edges;
 
 	segment->get_surrounding_edges(edges, sample_pos,
 		samples_per_pixel / Oversampling, base_->index());
 
 	if (edges.empty())
-		return;
+		return vector<LogicSegment::EdgePair>();
+
+	return edges;
 }
 
 void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,