X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=4af65f5488ec2b60f0f347e18389d307c0d04e9c;hb=474e817a724fdad4db635ba59202283fbcc22ef9;hp=be2dadf11a0023a5cc1bce1204b71ad1a7a43d8f;hpb=0ce3d18c04b989eeae55d5a82d133a2d154ad6c1;p=pulseview.git

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index be2dadf1..4af65f54 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -66,6 +66,7 @@ using std::min;
 using std::pair;
 using std::shared_ptr;
 using std::tie;
+using std::unordered_set;
 using std::vector;
 
 namespace pv {
@@ -687,8 +688,8 @@ void DecodeTrace::create_decoder_form(int index,
 	}
 
 	// Add the options
-	shared_ptr<prop::binding::DecoderOptions> binding(
-		new prop::binding::DecoderOptions(decoder_stack_, dec));
+	shared_ptr<binding::Decoder> binding(
+		new binding::Decoder(decoder_stack_, dec));
 	binding->add_properties_to_form(decoder_form, true);
 
 	bindings_.push_back(binding);
@@ -704,7 +705,12 @@ QComboBox* DecodeTrace::create_channel_selector(
 	assert(dec);
 
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session_.signals());
+	const auto &sigs(session_.signals());
+
+	vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
+	std::sort(sig_list.begin(), sig_list.end(),
+		[](const shared_ptr<Signal> &a, const shared_ptr<Signal> b) {
+			return a->name().compare(b->name()) < 0; });
 
 	assert(decoder_stack_);
 	const auto channel_iter = dec->channels().find(pdch);
@@ -716,16 +722,15 @@ QComboBox* DecodeTrace::create_channel_selector(
 	if (channel_iter == dec->channels().end())
 		selector->setCurrentIndex(0);
 
-	for(size_t i = 0; i < sigs.size(); i++) {
-		const shared_ptr<view::Signal> s(sigs[i]);
+	for (const shared_ptr<view::Signal> &s : sig_list) {
 		assert(s);
-
 		if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
 		{
 			selector->addItem(s->name(),
 				qVariantFromValue((void*)s.get()));
 			if ((*channel_iter).second == s)
-				selector->setCurrentIndex(i + 1);
+				selector->setCurrentIndex(
+					selector->count() - 1);
 		}
 	}
 
@@ -739,7 +744,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
 	map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
 
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
 
 	for (const ChannelSelector &s : channel_selectors_)
 	{