mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cabana: fix segfault when editing signal while filtering (#28836)

Browse Source 
Fix the issue that editing signal will segfault when there is a filter string.
old-commit-hash: 1301e2d640c9e14117f832bf37cbf469dbc43900
This commit is contained in:
Dean Lee
2023-07-08 06:39:03 +08:00
committed by GitHub
parent 5d520dc7ae
commit 592bcec5d6
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/cabana/signalview.cc
View File

@@ -226,10 +226,14 @@ void SignalModel::handleMsgChanged(MessageId id) {
void SignalModel::handleSignalAdded(MessageId id, const cabana::Signal *sig) {
if (id == msg_id) {
int i = dbc()->msg(msg_id)->indexOf(sig);
beginInsertRows({}, i, i);
insertItem(root.get(), i, sig);
endInsertRows();
if (filter_str.isEmpty()) {
int i = dbc()->msg(msg_id)->indexOf(sig);
beginInsertRows({}, i, i);
insertItem(root.get(), i, sig);
endInsertRows();
} else if (sig->name.contains(filter_str, Qt::CaseInsensitive)) {
refresh();
}
}
}
@@ -237,12 +241,14 @@ void SignalModel::handleSignalUpdated(const cabana::Signal *sig) {
if (int row = signalRow(sig); row != -1) {
emit dataChanged(index(row, 0), index(row, 1), {Qt::DisplayRole, Qt::EditRole, Qt::CheckStateRole});
// move row when the order changes.
int to = dbc()->msg(msg_id)->indexOf(sig);
if (to != row) {
beginMoveRows({}, row, row, {}, to > row ? to + 1 : to);
root->children.move(row, to);
endMoveRows();
if (filter_str.isEmpty()) {
// move row when the order changes.
int to = dbc()->msg(msg_id)->indexOf(sig);
if (to != row) {
beginMoveRows({}, row, row, {}, to > row ? to + 1 : to);
root->children.move(row, to);
endMoveRows();
}
}
}
}