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

Fixed filterLabeling not loading from settings correctly

Browse Source
This commit is contained in:
Andy Huska
2023-05-22 16:33:44 -05:00
parent ab476c746e
commit f39b61f4e8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+5 -4
View File
@@ -736,7 +736,7 @@ bool DBCFile::parseAttributeLine(QString line)
DBC_ATTRIBUTE *foundAttr = findAttributeByName(match.captured(1)); DBC_ATTRIBUTE *foundAttr = findAttributeByName(match.captured(1));
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That attribute does exist"; qDebug() << "That message attribute does exist";
DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFul); DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFul);
if (foundMsg) if (foundMsg)
{ {
@@ -768,7 +768,7 @@ bool DBCFile::parseAttributeLine(QString line)
DBC_ATTRIBUTE *foundAttr = findAttributeByName(match.captured(1)); DBC_ATTRIBUTE *foundAttr = findAttributeByName(match.captured(1));
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That attribute does exist"; qDebug() << "That signal attribute does exist";
DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFUL); DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFUL);
if (foundMsg) if (foundMsg)
{ {
@@ -801,7 +801,7 @@ bool DBCFile::parseAttributeLine(QString line)
DBC_ATTRIBUTE *foundAttr = findAttributeByName(match.captured(1)); DBC_ATTRIBUTE *foundAttr = findAttributeByName(match.captured(1));
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That attribute does exist"; qDebug() << "That node attribute does exist";
DBC_NODE *foundNode = findNodeByName(match.captured(2)); DBC_NODE *foundNode = findNodeByName(match.captured(2));
if (foundNode) if (foundNode)
{ {
@@ -2292,6 +2292,7 @@ DBCHandler::DBCHandler()
{ {
// Load previously saved DBC file settings // Load previously saved DBC file settings
QSettings settings; QSettings settings;
qDebug() <<"Settings file: " << settings.fileName();
int filecount = settings.value("DBC/FileCount", 0).toInt(); int filecount = settings.value("DBC/FileCount", 0).toInt();
qDebug() << "Previously loaded DBC file count: " << filecount; qDebug() << "Previously loaded DBC file count: " << filecount;
for (int i=0; i<filecount; i++) for (int i=0; i<filecount; i++)
@@ -2317,7 +2318,7 @@ DBCHandler::DBCHandler()
file->dbc_attributes.append(attr); file->dbc_attributes.append(attr);
file->messageHandler->setMatchingCriteria(matchingCriteria); file->messageHandler->setMatchingCriteria(matchingCriteria);
int filterLabeling = settings.value("DBC/FilterLabeling_" + QString(i),0).toInt(); int filterLabeling = settings.value("DBC/FilterLabeling_" + QString::number(i),0).toInt();
attr.attrType = ATTR_TYPE_MESSAGE; attr.attrType = ATTR_TYPE_MESSAGE;
attr.defaultValue = filterLabeling; attr.defaultValue = filterLabeling;
attr.enumVals.clear(); attr.enumVals.clear();
dbc/dbcloadsavewindow.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ void DBCLoadSaveWindow::updateSettings()
settings.setValue("DBC/Filename_" + QString::number(i), file->getFullFilename()); settings.setValue("DBC/Filename_" + QString::number(i), file->getFullFilename());
settings.setValue("DBC/AssocBus_" + QString::number(i), file->getAssocBus()); settings.setValue("DBC/AssocBus_" + QString::number(i), file->getAssocBus());
settings.setValue("DBC/MatchingCriteria_" + QString::number(i), file->messageHandler->getMatchingCriteria()); settings.setValue("DBC/MatchingCriteria_" + QString::number(i), file->messageHandler->getMatchingCriteria());
settings.setValue("DBC/FilterLabeling_" + QString::number(i), file->messageHandler->filterLabeling()); settings.setValue("DBC/FilterLabeling_" + QString::number(i), file->messageHandler->filterLabeling() ? 1 : 0);
} }
} }
emit updatedDBCSettings(); emit updatedDBCSettings();