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

Fixed broken DBC string signal code, make signal size automatically update in signal editor

Browse Source
This commit is contained in:
Collin Kidder
2017-01-08 19:25:03 -05:00
parent 72ccbc8b97
commit 3d4db6e921
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbc_classes.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString)
if (valType == STRING) if (valType == STRING)
{ {
QString buildString; QString buildString;
int startByte = signalSize / 8; int startByte = startBit / 8;
int bytes = signalSize / 8; int bytes = signalSize / 8;
for (int x = 0; x < bytes; x++) buildString.append(frame.data[startByte + x]); for (int x = 0; x < bytes; x++) buildString.append(frame.data[startByte + x]);
outString = buildString; outString = buildString;
dbc/dbcsignaleditor.cpp
+1 -1
View File
@@ -139,7 +139,7 @@ DBCSignalEditor::DBCSignalEditor(DBCHandler *handler, QWidget *parent) :
if (currentSignal == NULL) return; if (currentSignal == NULL) return;
currentSignal->unitName = ui->txtUnitName->text().simplified().replace(' ', '_'); currentSignal->unitName = ui->txtUnitName->text().simplified().replace(' ', '_');
}); });
connect(ui->txtBitLength, &QLineEdit::editingFinished, connect(ui->txtBitLength, &QLineEdit::textChanged,
[=]() [=]()
{ {
if (currentSignal == NULL) return; if (currentSignal == NULL) return;