X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6a342915972312b96e29e731fd75fed59191df6e;hb=92ff2b60d60c8191a6f4a923b5a9099ec544adbd;hp=99a28e4d7ee187b805490699ace737428cc31e1f;hpb=769a79b51a3c042770e97bb3303d0b8a20f5c648;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 99a28e4..6a34291 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -48,6 +48,7 @@
 #include "ruler.hpp"
 #include "signal.hpp"
 #include "tracegroup.hpp"
+#include "triggermarker.hpp"
 #include "view.hpp"
 #include "viewport.hpp"
 
@@ -114,6 +115,7 @@ View::View(Session &session, QWidget *parent) :
 	show_cursors_(false),
 	cursors_(new CursorPair(*this)),
 	next_flag_text_('A'),
+	trigger_markers_(),
 	hover_point_(-1, -1)
 {
 	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -207,6 +209,10 @@ vector< shared_ptr<TimeItem> > View::time_items() const
 	items.push_back(cursors_);
 	items.push_back(cursors_->first());
 	items.push_back(cursors_->second());
+
+	for (auto trigger_marker : trigger_markers_)
+		items.push_back(trigger_marker);
+
 	return items;
 }
 
@@ -349,24 +355,12 @@ void View::zoom_one_to_one()
 	if (visible_data.empty())
 		return;
 
-	double samplerate = 0.0;
-	for (const shared_ptr<SignalData> d : visible_data) {
-		assert(d);
-		const vector< shared_ptr<Segment> > segments =
-			d->segments();
-		for (const shared_ptr<Segment> &s : segments)
-			samplerate = max(samplerate, s->samplerate());
-	}
-
-	if (samplerate == 0.0)
-		return;
-
 	assert(viewport_);
 	const int w = viewport_->width();
 	if (w <= 0)
 		return;
 
-	set_zoom(1.0 / samplerate, w / 2);
+	set_zoom(1.0 / session_.get_samplerate(), w / 2);
 }
 
 void View::set_scale_offset(double scale, const Timestamp& offset)
@@ -474,8 +468,10 @@ void View::add_flag(const Timestamp& time)
 {
 	flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
 		QString("%1").arg(next_flag_text_))));
+
 	next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
 		(next_flag_text_ + 1);
+
 	time_item_appearance_changed(true, true);
 }
 
@@ -530,6 +526,12 @@ void View::restack_all_trace_tree_items()
 		i->animate_to_layout_v_offset();
 }
 
+void View::trigger_event(util::Timestamp location)
+{
+	trigger_markers_.push_back(shared_ptr<TriggerMarker>(
+		new TriggerMarker(*this, location)));
+}
+
 void View::get_scroll_layout(double &length, Timestamp &offset) const
 {
 	const pair<Timestamp, Timestamp> extents = get_time_extents();
@@ -1017,9 +1019,12 @@ void View::signals_changed()
 
 void View::capture_state_updated(int state)
 {
-	if (state == Session::Running)
+	if (state == Session::Running) {
 		set_time_unit(util::TimeUnit::Samples);
 
+		trigger_markers_.clear();
+	}
+
 	if (state == Session::Stopped) {
 		// After acquisition has stopped we need to re-calculate the ticks once
 		// as it's otherwise done when the user pans or zooms, which is too late