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

Fix a small typo in DBC handler - Thanks to dimavs on github.

Browse Source
This commit is contained in:
Collin Kidder
2017-07-12 18:02:00 -04:00
parent 8830950f85
commit 82550237ee
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+3 -3
View File
@@ -431,7 +431,7 @@ void DBCFile::loadFile(QString fileName)
sig.unitName = match.captured(10 + offset); sig.unitName = match.captured(10 + offset);
if (match.captured(11 + offset).contains(',')) if (match.captured(11 + offset).contains(','))
{ {
QString tmp = match.captured(11).split(',')[0]; QString tmp = match.captured(11 + offset).split(',')[0];
sig.receiver = findNodeByName(tmp); sig.receiver = findNodeByName(tmp);
} }
else sig.receiver = findNodeByName(match.captured(11 + offset)); else sig.receiver = findNodeByName(match.captured(11 + offset));
@@ -596,7 +596,7 @@ void DBCFile::loadFile(QString fileName)
} }
if (line.startsWith("BA_DEF_DEF_ ")) //definition of default value for an attribute if (line.startsWith("BA_DEF_DEF_ ")) //definition of default value for an attribute
{ {
regex.setPattern("^BA\\_DEF\\_DEF\\_ \\\"*(\\w+)\\\"* \\\"*([#\\w]*)\\\"*"); regex.setPattern("^BA\\_DEF\\_DEF\\_ \\\"*(\\w+)\\\"* \\\"*([#\\w]*)\\\"*");
match = regex.match(line); match = regex.match(line);
//captured 1 is the name of the attribute //captured 1 is the name of the attribute
@@ -606,7 +606,7 @@ void DBCFile::loadFile(QString fileName)
qDebug() << "Found an attribute default value line, searching for an attribute named " << match.captured(1) << "with data " << match.captured(2); qDebug() << "Found an attribute default value line, searching for an attribute named " << match.captured(1) << "with data " << match.captured(2);
DBC_ATTRIBUTE *found = findAttributeByName(match.captured(1)); DBC_ATTRIBUTE *found = findAttributeByName(match.captured(1));
if (found) if (found)
{ {
switch (found->valType) switch (found->valType)
{ {
case QSTRING: case QSTRING: