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

Add IDs everywhere messages are reported in the DBC comparison window.

Browse Source
This commit is contained in:
Collin Kidder
2020-07-29 21:52:12 -04:00
parent a5b7410629
commit 6dddee0e6c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/dbccomparatorwindow.cpp
+7 -6
View File
@@ -233,7 +233,7 @@ void DBCComparatorWindow::calculateDetails()
if (!otherMsg) if (!otherMsg)
{ {
QTreeWidgetItem *missingMsgItem = new QTreeWidgetItem(); QTreeWidgetItem *missingMsgItem = new QTreeWidgetItem();
missingMsgItem->setText(0, msgName); missingMsgItem->setText(0, msgName+ " (" + Utility::formatCANID(thisMsg->ID) + ")");
msgMissingDBCSecond->addChild(missingMsgItem); msgMissingDBCSecond->addChild(missingMsgItem);
} }
else //both have Msg. Check sigs for missing else //both have Msg. Check sigs for missing
@@ -254,7 +254,7 @@ void DBCComparatorWindow::calculateDetails()
{ {
thisMsgHasMissing = true; thisMsgHasMissing = true;
msgItem = new QTreeWidgetItem(); msgItem = new QTreeWidgetItem();
msgItem->setText(0, msgName); msgItem->setText(0, msgName + " (" + Utility::formatCANID(thisMsg->ID) + ")");
sigDiffTwo->addChild(msgItem); sigDiffTwo->addChild(msgItem);
} }
msgItem->addChild(missingSigItem); msgItem->addChild(missingSigItem);
@@ -298,7 +298,7 @@ void DBCComparatorWindow::calculateDetails()
{ {
thisMsgHasMods = true; thisMsgHasMods = true;
sigTemp = new QTreeWidgetItem(); sigTemp = new QTreeWidgetItem();
sigTemp->setText(0, msgName); sigTemp->setText(0, msgName + " (" + Utility::formatCANID(thisMsg->ID) + ")");
sigModifiedRoot->addChild(sigTemp); sigModifiedRoot->addChild(sigTemp);
} }
sigTemp->addChild(sigItem); sigTemp->addChild(sigItem);
@@ -319,7 +319,7 @@ void DBCComparatorWindow::calculateDetails()
{ {
thisMsgHasMissing = true; thisMsgHasMissing = true;
msgItem = new QTreeWidgetItem(); msgItem = new QTreeWidgetItem();
msgItem->setText(0, msgName); msgItem->setText(0, msgName + " (" + Utility::formatCANID(thisMsg->ID) + ")");
sigDiffOne->addChild(msgItem); sigDiffOne->addChild(msgItem);
} }
msgItem->addChild(missingSigItem); msgItem->addChild(missingSigItem);
@@ -330,12 +330,13 @@ void DBCComparatorWindow::calculateDetails()
for (int i = 0; i < secondDBC->messageHandler->getCount(); i++) for (int i = 0; i < secondDBC->messageHandler->getCount(); i++)
{ {
QString msgName = secondDBC->messageHandler->findMsgByIdx(i)->name; DBC_MESSAGE *origMsg = secondDBC->messageHandler->findMsgByIdx(i);
QString msgName = origMsg->name;
DBC_MESSAGE *msg = firstDBC->messageHandler->findMsgByName(msgName); DBC_MESSAGE *msg = firstDBC->messageHandler->findMsgByName(msgName);
if (!msg) if (!msg)
{ {
QTreeWidgetItem *missingMsgItem = new QTreeWidgetItem(); QTreeWidgetItem *missingMsgItem = new QTreeWidgetItem();
missingMsgItem->setText(0, msgName); missingMsgItem->setText(0, msgName + " (" + Utility::formatCANID(origMsg->ID) + ")");
msgMissingDBCFirst->addChild(missingMsgItem); msgMissingDBCFirst->addChild(missingMsgItem);
} }
} }