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

Fixes to hopefully make signal colors look proper.

Browse Source
This commit is contained in:
Collin Kidder
2020-02-12 21:16:02 -05:00
parent 48d7dfa97c
commit 7f8411f47f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+2 -2
View File
@@ -1507,8 +1507,8 @@ DBCFile* DBCHandler::loadJSONFile(int idx)
msg.sender = thisFile->findNodeByIdx(0); msg.sender = thisFile->findNodeByIdx(0);
QString nodeName = iter->toObject().find("originNode").value().toString(); QString nodeName = iter->toObject().find("originNode").value().toString();
msg.sender = thisFile->findNodeByName(nodeName); msg.sender = thisFile->findNodeByName(nodeName);
msg.bgColor = QColor(); msg.bgColor = QColor(thisFile->findAttributeByName("GenMsgBackgroundColor")->defaultValue.toString());
msg.fgColor = QColor(); msg.fgColor = QColor(thisFile->findAttributeByName("GenMsgForegroundColor")->defaultValue.toString());
if (!msg.sender && nodeName.length() > 1) if (!msg.sender && nodeName.length() > 1)
{ {
DBC_NODE node; DBC_NODE node;
dbc/dbcmaineditor.cpp
+2 -2
View File
@@ -288,8 +288,8 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
newMsg.name = ""; newMsg.name = "";
newMsg.sender = node; newMsg.sender = node;
newMsg.len = 0; newMsg.len = 0;
newMsg.fgColor = ui->MessagesTable->item(row, 4)->backgroundColor(); newMsg.fgColor = QColor(dbcFile->findAttributeByName("GenMsgForegroundColor")->defaultValue.toString());
newMsg.bgColor = ui->MessagesTable->item(row, 5)->backgroundColor(); newMsg.bgColor = QColor(dbcFile->findAttributeByName("GenMsgBackgroundColor")->defaultValue.toString());
for (int i = 0; i < referenceFrames->length(); i++) for (int i = 0; i < referenceFrames->length(); i++)
{ {