Switched code around to better support high/low range for multiplexed

signals
This commit is contained in:
Collin Kidder
2021-02-23 22:14:43 -05:00
parent e00aa1150a
commit bcfaffbe5d
6 changed files with 72 additions and 74 deletions
+4 -2
View File
@@ -363,7 +363,9 @@ QString DBCMainEditor::createSignalText(DBC_SIGNAL *sig)
QString sigInfo;
if (sig->isMultiplexed)
{
sigInfo = "(" + QString::number(sig->multiplexValue) + ") ";
sigInfo = "(" + QString::number(sig->multiplexLowValue);
if (sig->multiplexHighValue != sig->multiplexLowValue) sigInfo += "-" + QString::number(sig->multiplexHighValue);
sigInfo += ") ";
}
sigInfo.append(sig->name);
if (sig->comment.count() > 0) sigInfo.append(" - ").append(sig->comment);
@@ -386,7 +388,7 @@ void DBCMainEditor::processSignalToTree(QTreeWidgetItem *parent, DBC_SIGNAL *sig
{
for (int i = 0; i < sig->multiplexedChildren.count(); i++)
{
processSignalToTree(sigItem, sig->multiplexedChildren[i].sig);
processSignalToTree(sigItem, sig->multiplexedChildren[i]);
}
}
}