From d6ec5da14e1c47ff97919bcc83f74f9ba0b0fac3 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 13 Jan 2023 05:27:46 +0800 Subject: [PATCH] cabana: filtering in both address and msg name (#26929) search in address and name Co-authored-by: Shane Smiskol old-commit-hash: 66d0d4c7d7035375bc17bdc9da404c2a5e77d453 --- tools/cabana/messageswidget.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index dbf87a3da2..a5224e108b 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -80,11 +80,11 @@ QVariant MessageListModel::data(const QModelIndex &index, int role) const { void MessageListModel::setFilterString(const QString &string) { filter_str = string; - bool search_id = filter_str.contains(':'); msgs.clear(); for (auto it = can->can_msgs.begin(); it != can->can_msgs.end(); ++it) { - if ((search_id ? it.key() : msgName(it.key())).contains(filter_str, Qt::CaseInsensitive)) + if (it.key().contains(filter_str, Qt::CaseInsensitive) || msgName(it.key()).contains(filter_str, Qt::CaseInsensitive)) { msgs.push_back(it.key()); + } } sortMessages(); }