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

Merge branch 'master' into support_multiple_signal_multiplex_values

Browse Source
This commit is contained in:
Collin Kidder
2025-05-05 20:53:25 -04:00
committed by GitHub
parent 1dce603325 6271e52987
commit 6f69f65444
56 changed files with 2312 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbc_classes.cpp
+8 -4
View File
@@ -166,12 +166,16 @@ QString DBC_SIGNAL::processSignalTree(const CANFrame &frame)
if (sig->processAsText(frame, sigString))
{
qDebug() << "Returned value: " << sigString;
if (!build.isEmpty() && !sigString.isEmpty())
build.append("\n");
build.append(sigString);
build.append("\n");
if (sig->isMultiplexor)
{
qDebug() << "Spelunkin!";
build.append(sig->processSignalTree(frame));
auto subTreeString = sig->processSignalTree(frame);
if (!build.isEmpty() && !subTreeString.isEmpty())
build.append("\n");
build.append(subTreeString);
}
}
}
@@ -300,12 +304,12 @@ QString DBC_SIGNAL::makePrettyOutput(double floatVal, int64_t intVal, bool outpu
}
}
if (!foundVal) outputString += QString::number(intVal);
if (outputUnit) outputString += unitName;
if (outputUnit) outputString += " " + unitName;
}
else //otherwise display the actual number and unit (if it exists)
{
outputString += (isInteger ? QString::number(intVal) : QString::number(floatVal));
if (outputUnit) outputString += unitName;
if (outputUnit) outputString += " " + unitName;
}
return outputString;
}