t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed default signalviewer message matching to be by ID

Browse Source
This commit is contained in:
Andy Huska
2022-09-20 16:27:53 -05:00
parent e6058ead34
commit da7a721494
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
signalviewerwindow.cpp
+3 -2
View File
@@ -283,14 +283,15 @@ void SignalViewerWindow::loadDefinitions(bool append)
QString msgName = QString(tokens[2]); QString msgName = QString(tokens[2]);
QString sigName = QString(tokens[3]); QString sigName = QString(tokens[3]);
DBC_MESSAGE *msg;; DBC_MESSAGE *msg;;
if (msg = dbcHandler->findMessage(msgName)) if(msg = dbcHandler->findMessage(msgId))
{ {
sig = msg->sigHandler->findSignalByName(sigName); sig = msg->sigHandler->findSignalByName(sigName);
if(sig) if(sig)
loadedSignals.append(sig); loadedSignals.append(sig);
} }
else if(msg = dbcHandler->findMessage(msgId)) else if (msg = dbcHandler->findMessage(msgName))
{ {
//this is not a very safe way to match since messages names can be duplicated
sig = msg->sigHandler->findSignalByName(sigName); sig = msg->sigHandler->findSignalByName(sigName);
if(sig) if(sig)
loadedSignals.append(sig); loadedSignals.append(sig);