From 692f6093f949582468a23fea7725450fb5ef277b Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Tue, 13 Jun 2017 23:28:02 +0200 Subject: [PATCH] DecodeSignal: Improve auto_assign_signals() matching Before, signals named "SCL analog" and "SDA analog" wouldn't be assigned to an I2C decoder. --- pv/data/decodesignal.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 339c85d..4c8548f 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -265,11 +265,16 @@ void DecodeSignal::auto_assign_signals() if (ch.assigned_signal) continue; - for (shared_ptr s : session_.signalbases()) - if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower()))) { + for (shared_ptr s : session_.signalbases()) { + const QString ch_name = ch.name.toLower(); + const QString s_name = s->name().toLower(); + + if (s->logic_data() && + ((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) { ch.assigned_signal = s.get(); new_assignment = true; } + } } if (new_assignment) { -- 2.30.2