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

Vast change to CAN data grid to show signal names. Many graphical

Browse Source 
tweaks, some bug fixes.
This commit is contained in:
Collin Kidder
2021-08-24 22:28:32 -04:00
parent 20f7217ad3
commit bba4fccac6
6 changed files with 262 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbcsignaleditor.cpp
+15 -2
View File
@@ -376,7 +376,12 @@ void DBCSignalEditor::showEvent(QShowEvent* event)
for (int x = 0; x < dbcMessage->sigHandler->getCount(); x++)
{
DBC_SIGNAL *sig = dbcMessage->sigHandler->findSignalByIdx(x);
ui->bitfield->setSignalNames(x, sig->name);
//only set a signal name for signals which match multiplexparent with our currentsignal
if (!sig->multiplexParent || ((sig->multiplexParent == currentSignal->multiplexParent) && (sig->multiplexHighValue == currentSignal->multiplexHighValue)) )
{
ui->bitfield->setSignalNames(x, sig->name);
qDebug() << sig->name << sig->multiplexParent;
}
}
}
@@ -640,8 +645,16 @@ void DBCSignalEditor::generateUsedBits()
for (int x = 0; x < dbcMessage->sigHandler->getCount(); x++)
{
DBC_SIGNAL *sig = dbcMessage->sigHandler->findSignalByIdx(x);
DBC_SIGNAL *sig = dbcMessage->sigHandler->findSignalByIdx(x);
//only pay attention to this signal if it's multiplexParent matches currentSignal or is null
if (sig->multiplexParent)
{
if (sig->multiplexParent != currentSignal->multiplexParent) continue; //go thee away!
if (sig->multiplexHighValue != currentSignal->multiplexHighValue) continue; //buzz off
if (sig->multiplexLowValue != currentSignal->multiplexLowValue) continue;
}
startBit = sig->startBit;
if (sig->intelByteOrder)