X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=5b2bb31d75e1217e7567d634f289eaab0985bd03;hp=6bc691abb5d49a29185a6b404c80bb88f22a548f;hb=132a5c6d4b3c220d1cb6d942bf9d7e8b180ab1c3;hpb=9f97b3576f527239594ea0accb82a4087147c746

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 6bc691a..5b2bb31 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -36,13 +36,16 @@ using pv::data::decode::Row;
 namespace pv {
 namespace data {
 
-DecodeSignal::DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack) :
+DecodeSignal::DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack,
+	const unordered_set< shared_ptr<data::SignalBase> > &all_signals) :
 	SignalBase(nullptr, SignalBase::DecodeChannel),
-	decoder_stack_(decoder_stack)
+	decoder_stack_(decoder_stack),
+	all_signals_(all_signals)
 {
 	set_name(QString::fromUtf8(decoder_stack_->stack().front()->decoder()->name));
 
 	update_channel_list();
+	auto_assign_signals();
 
 	connect(decoder_stack_.get(), SIGNAL(new_annotations()),
 		this, SLOT(on_new_annotations()));
@@ -72,7 +75,11 @@ void DecodeSignal::stack_decoder(srd_decoder *decoder)
 	assert(decoder);
 	assert(decoder_stack);
 	decoder_stack_->push(make_shared<data::decode::Decoder>(decoder));
+
+	// Include the newly created decode channels in the channel list
 	update_channel_list();
+
+	auto_assign_signals();
 	decoder_stack_->begin_decode();
 }
 
@@ -113,6 +120,19 @@ const list<data::DecodeChannel> DecodeSignal::get_channels() const
 	return channels_;
 }
 
+void DecodeSignal::auto_assign_signals()
+{
+	// Try to auto-select channels that don't have signals assigned yet
+	for (data::DecodeChannel &ch : channels_) {
+		if (ch.assigned_signal)
+			continue;
+
+		for (shared_ptr<data::SignalBase> s : all_signals_)
+			if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower())))
+				ch.assigned_signal = s.get();
+	}
+}
+
 void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *signal)
 {
 	for (data::DecodeChannel &ch : channels_)