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

Minor fixes to DBC code

Browse Source
This commit is contained in:
Collin Kidder
2020-11-18 20:31:39 -05:00
parent 80523f2eeb
commit 3d4cf98e3d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+3
View File
@@ -281,6 +281,7 @@ DBCFile::DBCFile()
messageHandler->setMatchingCriteria(EXACT); messageHandler->setMatchingCriteria(EXACT);
messageHandler->setFilterLabeling(false); messageHandler->setFilterLabeling(false);
isDirty = false; isDirty = false;
fileName = "<Unsaved File>";
} }
DBCFile::DBCFile(const DBCFile& cpy) : QObject() DBCFile::DBCFile(const DBCFile& cpy) : QObject()
@@ -1534,6 +1535,7 @@ int DBCHandler::createBlankFile()
falseNode.name = "Vector__XXX"; falseNode.name = "Vector__XXX";
falseNode.comment = "Default node if none specified"; falseNode.comment = "Default node if none specified";
newFile.dbc_nodes.append(falseNode); newFile.dbc_nodes.append(falseNode);
newFile.setAssocBus(-1);
loadedFiles.append(newFile); loadedFiles.append(newFile);
return loadedFiles.count(); return loadedFiles.count();
@@ -1587,6 +1589,7 @@ DBCFile* DBCHandler::loadJSONFile(QString filename)
createBlankFile(); createBlankFile();
thisFile = &loadedFiles.last(); thisFile = &loadedFiles.last();
QFile *inFile = new QFile(filename); QFile *inFile = new QFile(filename);
if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text)) if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
{ {