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

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 26282a78..69599b1b 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -52,6 +52,7 @@
 #include "view.hpp"
 #include "viewport.hpp"
 
+#include "pv/metadata_obj.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/devices/device.hpp"
@@ -182,6 +183,13 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 
 	GlobalSettings::add_change_handler(this);
 
+	// Set up metadata objects and event handlers
+	if (is_main_view) {
+		session_.metadata_obj_manager()->create_object(MetadataObjMainViewRange);
+		session_.metadata_obj_manager()->create_object(MetadataObjMousePos);
+	}
+
+	// Set up UI event handlers
 	connect(scrollarea_->horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
 	connect(scrollarea_->verticalScrollBar(), SIGNAL(valueChanged(int)),
@@ -318,7 +326,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 +353,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_);
@@ -525,6 +533,22 @@ void View::set_offset(const pv::util::Timestamp& offset, bool force_update)
 	if ((offset_ != offset) || force_update) {
 		offset_ = offset;
 		ruler_offset_ = offset_ + zero_offset_;
+
+		const int w = viewport_->width();
+		if (w > 0) {
+			const double samplerate = session_.get_samplerate();
+			// Note: sample_num = time * samplerate
+			// Note: samples_per_pixel = samplerate * scale
+			int64_t start_sample = (offset_ * samplerate).convert_to<int64_t>();
+			int64_t end_sample = (offset_ * samplerate).convert_to<int64_t>() +
+				(w * session_.get_samplerate() * scale_);
+
+			MetadataObject* md_obj =
+				session_.metadata_obj_manager()->find_object_by_type(MetadataObjMainViewRange);
+			md_obj->set_value(MetadataValueStartSample, QVariant((qlonglong)start_sample));
+			md_obj->set_value(MetadataValueEndSample, QVariant((qlonglong)end_sample));
+		}
+
 		offset_changed();
 	}
 }
@@ -783,6 +807,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 +855,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 +869,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();
@@ -1523,8 +1573,19 @@ void View::update_hover_point()
 	for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)
 		r->hover_point_changed(hover_point_);
 
-	// Notify any other listeners
+	// Notify this view's listeners
 	hover_point_changed(hover_widget_, hover_point_);
+
+	// Hover point is -1 when invalid and 0 for the header
+	if (hover_point_.x() > 0) {
+		// Notify global listeners
+		pv::util::Timestamp mouse_time = offset_ + hover_point_.x() * scale_;
+		int64_t sample_num = (mouse_time * session_.get_samplerate()).convert_to<int64_t>();
+
+		MetadataObject* md_obj =
+			session_.metadata_obj_manager()->find_object_by_type(MetadataObjMousePos);
+		md_obj->set_value(MetadataValueStartSample, QVariant((qlonglong)sample_num));
+	}
 }
 
 void View::row_item_appearance_changed(bool label, bool content)