mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-06 00:36:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

cabana/MessageListModel: replace match |= with match = match || (#29667)

Browse Source
This commit is contained in:
Dean Lee
2023-08-28 00:56:49 +08:00
committed by GitHub
parent ab05bff07d
commit 4f915f4f1a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cabana/messageswidget.cc
+5 -4
View File
@@ -281,7 +281,8 @@ bool MessageListModel::matchMessage(const MessageId &id, const CanData &data, co
case Column::NAME: {
const auto msg = dbc()->msg(id);
match = re.match(msg ? msg->name : UNTITLED).hasMatch();
match |= msg && std::any_of(msg->sigs.cbegin(), msg->sigs.cend(), [&re](const auto &s) { return re.match(s->name).hasMatch(); });
match = match || (msg && std::any_of(msg->sigs.cbegin(), msg->sigs.cend(),
[&re](const auto &s) { return re.match(s->name).hasMatch(); }));
break;
}
case Column::SOURCE:
@@ -289,7 +290,7 @@ bool MessageListModel::matchMessage(const MessageId &id, const CanData &data, co
break;
case Column::ADDRESS: {
match = re.match(QString::number(id.address, 16)).hasMatch();
match |= parseRange(txt, id.address, 16);
match = match || parseRange(txt, id.address, 16);
break;
}
case Column::FREQ:
@@ -301,8 +302,8 @@ bool MessageListModel::matchMessage(const MessageId &id, const CanData &data, co
break;
case Column::DATA: {
match = QString(data.dat.toHex()).contains(txt, Qt::CaseInsensitive);
match |= re.match(QString(data.dat.toHex())).hasMatch();
match |= re.match(QString(data.dat.toHex(' '))).hasMatch();
match = match || re.match(QString(data.dat.toHex())).hasMatch();
match = match || re.match(QString(data.dat.toHex(' '))).hasMatch();
break;
}
}