X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=7e47140c6bf2f3d4335df419e8cea74dd8976ecf;hb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;hp=9841978a67f333a6b2c5eff555e70bea98590194;hpb=9e8f0e503e0c79c3765947ba5abae0ffc76850c4;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9841978a..7e47140c 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -186,6 +186,21 @@ const Session& View::session() const
 	return session_;
 }
 
+std::unordered_set< std::shared_ptr<view::Signal> > View::signals() const
+{
+	return signals_;
+}
+
+void View::clear_signals()
+{
+	signals_.clear();
+}
+
+void View::add_signal(const shared_ptr<view::Signal> signal)
+{
+	signals_.insert(signal);
+}
+
 View* View::view()
 {
 	return this;
@@ -397,11 +412,9 @@ void View::set_scale_offset(double scale, const Timestamp& offset)
 
 set< shared_ptr<SignalData> > View::get_visible_data() const
 {
-	const unordered_set< shared_ptr<Signal> > sigs(session().signals());
-
 	// Make a set of all the visible data objects
 	set< shared_ptr<SignalData> > visible_data;
-	for (const shared_ptr<Signal> sig : sigs)
+	for (const shared_ptr<Signal> sig : signals_)
 		if (sig->enabled())
 			visible_data.insert(sig->data());
 
@@ -739,7 +752,7 @@ void View::update_layout()
 
 TraceTreeItemOwner* View::find_prevalent_trace_group(
 	const shared_ptr<sigrok::ChannelGroup> &group,
-	const unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+	const unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
 		&signal_map)
 {
 	assert(group);
@@ -749,13 +762,13 @@ TraceTreeItemOwner* View::find_prevalent_trace_group(
 
 	// Make a set and a list of all the owners
 	for (const auto &channel : group->channels()) {
-		const auto iter = signal_map.find(channel);
-		if (iter == signal_map.end())
-			continue;
-
-		TraceTreeItemOwner *const o = (*iter).second->owner();
-		owner_list.push_back(o);
-		owners.insert(o);
+		for (auto entry : signal_map) {
+			if (entry.first->channel() == channel) {
+				TraceTreeItemOwner *const o = (entry.second)->owner();
+				owner_list.push_back(o);
+				owners.insert(o);
+			}
+		}
 	}
 
 	// Iterate through the list of owners, and find the most prevalent
@@ -776,24 +789,24 @@ TraceTreeItemOwner* View::find_prevalent_trace_group(
 
 vector< shared_ptr<Trace> > View::extract_new_traces_for_channels(
 	const vector< shared_ptr<sigrok::Channel> > &channels,
-	const unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+	const unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
 		&signal_map,
 	set< shared_ptr<Trace> > &add_list)
 {
 	vector< shared_ptr<Trace> > filtered_traces;
 
 	for (const auto &channel : channels) {
-		const auto map_iter = signal_map.find(channel);
-		if (map_iter == signal_map.end())
-			continue;
-
-		shared_ptr<Trace> trace = (*map_iter).second;
-		const auto list_iter = add_list.find(trace);
-		if (list_iter == add_list.end())
-			continue;
-
-		filtered_traces.push_back(trace);
-		add_list.erase(list_iter);
+		for (auto entry : signal_map) {
+			if (entry.first->channel() == channel) {
+				shared_ptr<Trace> trace = entry.second;
+				const auto list_iter = add_list.find(trace);
+				if (list_iter == add_list.end())
+					continue;
+
+				filtered_traces.push_back(trace);
+				add_list.erase(list_iter);
+			}
+		}
 	}
 
 	return filtered_traces;
@@ -803,10 +816,8 @@ void View::determine_time_unit()
 {
 	// Check whether we know the sample rate and hence can use time as the unit
 	if (time_unit_ == util::TimeUnit::Samples) {
-		const unordered_set< shared_ptr<Signal> > sigs(session().signals());
-
 		// Check all signals but...
-		for (const shared_ptr<Signal> signal : sigs) {
+		for (const shared_ptr<Signal> signal : signals_) {
 			const shared_ptr<SignalData> data = signal->data();
 
 			// ...only check first segment of each
@@ -938,9 +949,10 @@ void View::signals_changed()
 
 	if (!session_.device()) {
 		reset_scroll();
+		signals_.clear();
 	} else {
-		assert(sr_dev);
 		sr_dev = session_.device()->device();
+		assert(sr_dev);
 		channels = sr_dev->channels();
 	}
 
@@ -952,9 +964,7 @@ void View::signals_changed()
 	const set<shared_ptr<Trace>> prev_traces(
 		prev_trace_list.begin(), prev_trace_list.end());
 
-	const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
-
-	set< shared_ptr<Trace> > traces(sigs.begin(), sigs.end());
+	set< shared_ptr<Trace> > traces(signals_.begin(), signals_.end());
 
 #ifdef ENABLE_DECODE
 	const vector< shared_ptr<DecodeTrace> > decode_traces(
@@ -973,10 +983,10 @@ void View::signals_changed()
 		inserter(remove_traces, remove_traces.begin()));
 
 	// Make a look-up table of sigrok Channels to pulseview Signals
-	unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+	unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
 		signal_map;
-	for (const shared_ptr<Signal> &sig : sigs)
-		signal_map[sig->channel()] = sig;
+	for (const shared_ptr<Signal> &sig : signals_)
+		signal_map[sig->base()] = sig;
 
 	// Populate channel groups
 	if (sr_dev)