X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6ad7dea0822c0d6653a75b6b0ee2dd1e86a07e8b;hp=7f9caa4cb50e69fb63f50e621d5dad01adbebc99;hb=f74015db20c1ac85df6397df7199a030e6db828f;hpb=48257a69ffad409c9893605d99cd6e15161dff4f

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7f9caa4c..6ad7dea0 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -42,12 +42,13 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-#include "decodetrace.hpp"
+#include "analogsignal.hpp"
 #include "header.hpp"
 #include "logicsignal.hpp"
 #include "ruler.hpp"
 #include "signal.hpp"
 #include "tracegroup.hpp"
+#include "triggermarker.hpp"
 #include "view.hpp"
 #include "viewport.hpp"
 
@@ -57,6 +58,10 @@
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 
+#ifdef ENABLE_DECODE
+#include "decodetrace.hpp"
+#endif
+
 using boost::shared_lock;
 using boost::shared_mutex;
 
@@ -114,6 +119,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 +213,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;
 }
 
@@ -402,8 +412,7 @@ 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)
-	{
+	for (const shared_ptr<SignalData> d : visible_data) {
 		const vector< shared_ptr<Segment> > segments =
 			d->segments();
 		for (const shared_ptr<Segment> &s : segments) {
@@ -432,6 +441,33 @@ void View::enable_sticky_scrolling(bool state)
 	sticky_scrolling_ = state;
 }
 
+void View::enable_coloured_bg(bool state)
+{
+	const vector<shared_ptr<TraceTreeItem>> items(
+		list_by_type<TraceTreeItem>());
+
+	for (shared_ptr<TraceTreeItem> i : items) {
+		// Can't cast to Trace because it's abstract, so we need to
+		// check for any derived classes individually
+
+		shared_ptr<AnalogSignal> a = dynamic_pointer_cast<AnalogSignal>(i);
+		if (a)
+			a->set_coloured_bg(state);
+
+		shared_ptr<LogicSignal> l = dynamic_pointer_cast<LogicSignal>(i);
+		if (l)
+			l->set_coloured_bg(state);
+
+#ifdef ENABLE_DECODE
+		shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
+		if (d)
+			d->set_coloured_bg(state);
+#endif
+	}
+
+	viewport_->update();
+}
+
 bool View::cursors_shown() const
 {
 	return show_cursors_;
@@ -466,10 +502,6 @@ void View::add_flag(const Timestamp& time)
 	next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
 		(next_flag_text_ + 1);
 
-	// Skip 'T' (for trigger) as it's treated special
-	if (next_flag_text_ == 'T')
-		next_flag_text_ += 1;
-
 	time_item_appearance_changed(true, true);
 }
 
@@ -519,6 +551,12 @@ void View::restack_all_trace_tree_items()
 	for (auto &o : sorted_owners)
 		o->restack_items();
 
+	// Re-assign background colors
+	bool next_bgcolour_state = 0;
+
+	for (auto &o : sorted_owners)
+		next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
+
 	// Animate the items to their destination
 	for (const auto &i : items)
 		i->animate_to_layout_v_offset();
@@ -526,12 +564,8 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-	char next_flag_text = next_flag_text_;
-
-	next_flag_text_ = 'T';
-	add_flag(location);
-
-	next_flag_text_ = next_flag_text;
+	trigger_markers_.push_back(shared_ptr<TriggerMarker>(
+		new TriggerMarker(*this, location)));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -729,8 +763,7 @@ vector< shared_ptr<Trace> > View::extract_new_traces_for_channels(
 {
 	vector< shared_ptr<Trace> > filtered_traces;
 
-	for (const auto &channel : channels)
-	{
+	for (const auto &channel : channels) {
 		const auto map_iter = signal_map.find(channel);
 		if (map_iter == signal_map.end())
 			continue;
@@ -795,7 +828,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
 
 bool View::viewportEvent(QEvent *e)
 {
-	switch(e->type()) {
+	switch (e->type()) {
 	case QEvent::Paint:
 	case QEvent::MouseButtonPress:
 	case QEvent::MouseButtonRelease:
@@ -806,7 +839,6 @@ bool View::viewportEvent(QEvent *e)
 	case QEvent::TouchUpdate:
 	case QEvent::TouchEnd:
 		return false;
-
 	default:
 		return QAbstractScrollArea::viewportEvent(e);
 	}
@@ -922,8 +954,7 @@ void View::signals_changed()
 		signal_map[sig->channel()] = sig;
 
 	// Populate channel groups
-	for (auto entry : sr_dev->channel_groups())
-	{
+	for (auto entry : sr_dev->channel_groups()) {
 		const shared_ptr<sigrok::ChannelGroup> &group = entry.second;
 
 		if (group->channels().size() <= 1)
@@ -1021,9 +1052,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