X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=33122047745048e341c155956e6f99076b73e136;hb=85125b0f34be424fdf8a8a5133f2494722077d7d;hp=26282a78debed7fa569b8c7fd7ab4824288877d2;hpb=38b77a3ba1738aebf516491cc95e25219938a877;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 26282a78..33122047 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -318,7 +318,7 @@ const Session& View::session() const
 	return session_;
 }
 
-unordered_set< shared_ptr<Signal> > View::signals() const
+vector< shared_ptr<Signal> > View::signals() const
 {
 	return signals_;
 }
@@ -345,7 +345,7 @@ void View::clear_signals()
 void View::add_signal(const shared_ptr<Signal> signal)
 {
 	ViewBase::add_signalbase(signal->base());
-	signals_.insert(signal);
+	signals_.push_back(signal);
 
 	signal->set_segment_display_mode(segment_display_mode_);
 	signal->set_current_segment(current_segment_);
@@ -783,6 +783,26 @@ void View::zoom_fit(bool gui_state)
 	set_scale_offset(scale.convert_to<double>(), extents.first);
 }
 
+void View::focus_on_range(uint64_t start_sample, uint64_t end_sample)
+{
+	assert(viewport_);
+	const int w = viewport_->width();
+	if (w <= 0)
+		return;
+
+	const double samplerate = session_.get_samplerate();
+
+	const uint64_t sample_delta = (end_sample - start_sample);
+
+	// Note: We add 20% margin on the left and 5% on the right
+	const Timestamp delta = (sample_delta * 1.25) / samplerate;
+
+	const Timestamp scale = max(min(delta / w, MaxScale), MinScale);
+	const Timestamp offset = (start_sample - sample_delta * 0.20) / samplerate;
+
+	set_scale_offset(scale.convert_to<double>(), offset);
+}
+
 void View::set_scale_offset(double scale, const Timestamp& offset)
 {
 	// Disable sticky scrolling / always zoom to fit when acquisition runs
@@ -811,13 +831,13 @@ void View::set_scale_offset(double scale, const Timestamp& offset)
 	viewport_->update();
 }
 
-set< shared_ptr<SignalData> > View::get_visible_data() const
+vector< shared_ptr<SignalData> > View::get_visible_data() const
 {
 	// Make a set of all the visible data objects
-	set< shared_ptr<SignalData> > visible_data;
+	vector< shared_ptr<SignalData> > visible_data;
 	for (const shared_ptr<Signal>& sig : signals_)
 		if (sig->enabled())
-			visible_data.insert(sig->data());
+			visible_data.push_back(sig->data());
 
 	return visible_data;
 }
@@ -825,8 +845,14 @@ set< shared_ptr<SignalData> > View::get_visible_data() const
 pair<Timestamp, Timestamp> View::get_time_extents() const
 {
 	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) {
+
+	vector< shared_ptr<SignalData> > data;
+	if (signals_.size() == 0)
+		return make_pair(0, 0);
+
+	data.push_back(signals_.front()->data());
+
+	for (const shared_ptr<SignalData>& d : data) {
 		const vector< shared_ptr<Segment> > segments = d->segments();
 		for (const shared_ptr<Segment>& s : segments) {
 			double samplerate = s->samplerate();