Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dbc/dbc_classes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ DBC_MESSAGE::DBC_MESSAGE()
{
sigHandler = new DBCSignalHandler;
ID = 0;
extendedID = false;
len = 0;
multiplexorSignal = nullptr;
sender = nullptr;
Expand Down
3 changes: 2 additions & 1 deletion dbc/dbchandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,8 @@ DBC_MESSAGE* DBCFile::parseMessageLine(QString line)
msgPtr = new DBC_MESSAGE();
uint32_t ID = match.captured(1).toULong(); //the ID is always stored in decimal format
msgPtr->ID = ID & 0x1FFFFFFFul;
msgPtr->extendedID = (ID & 0x80000000ul) ? true : false;
// BO_ encodes extended frame information in bit 31.
msgPtr->extendedID = ((ID & 0x80000000ul) != 0);
msgPtr->name = match.captured(2);
msgPtr->len = match.captured(3).toUInt();
msgPtr->sender = findNodeByName(match.captured(4));
Expand Down
29 changes: 26 additions & 3 deletions dbc/dbcmessageeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "helpwindow.h"
#include "utility.h"

#include <QCheckBox>

DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
QDialog(parent),
ui(new Ui::DBCMessageEditor)
Expand Down Expand Up @@ -37,8 +39,11 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
if ((dbcMessage->ID & 0x1FFFFFFFul) != Utility::ParseStringToNum(ui->lineFrameID->text())) dbcFile->setDirtyFlag();
dbcMessage->ID = Utility::ParseStringToNum(ui->lineFrameID->text());

if (dbcMessage->ID > 0x7FF) dbcMessage->extendedID = true;
else dbcMessage->extendedID = false;
// Auto-enable extended for IDs that exceed standard 11-bit range.
if (dbcMessage->ID > 0x7FF && ui->checkExtended)
{
ui->checkExtended->setChecked(true);
}

emit updatedTreeInfo(dbcMessage, origID);
});
Expand All @@ -60,6 +65,17 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
if (suppressEditCallbacks) return;
if (dbcMessage->len != Utility::ParseStringToNum(ui->lineFrameLen->text())) dbcFile->setDirtyFlag();
dbcMessage->len = Utility::ParseStringToNum(ui->lineFrameLen->text());
emit updatedTreeInfo(dbcMessage, origID);
});

connect(ui->checkExtended, &QCheckBox::toggled,
[=](bool checked)
{
if (dbcMessage == nullptr) return;
if (suppressEditCallbacks) return;
if (dbcMessage->extendedID != checked) dbcFile->setDirtyFlag();
dbcMessage->extendedID = checked;
emit updatedTreeInfo(dbcMessage, origID);
});

connect(ui->comboSender, &QComboBox::currentTextChanged,
Expand Down Expand Up @@ -211,6 +227,8 @@ void DBCMessageEditor::setMessageRef(DBC_MESSAGE *msg)
{
dbcMessage = msg;
origID = msg->ID;
if (ui->checkExtended)
ui->checkExtended->setChecked(dbcMessage->extendedID);
}

void DBCMessageEditor::showEvent(QShowEvent* event)
Expand All @@ -222,12 +240,17 @@ void DBCMessageEditor::showEvent(QShowEvent* event)

void DBCMessageEditor::refreshView()
{
if (!dbcMessage) return;

suppressEditCallbacks = true;

ui->lineComment->setText(dbcMessage->comment);
ui->lineFrameID->setText(Utility::formatCANID(dbcMessage->ID & 0x1FFFFFFFul));
ui->lineMsgName->setText(dbcMessage->name);
ui->lineFrameLen->setText(QString::number(dbcMessage->len));
ui->lineFrameLen->setText(QString::number(dbcMessage->len));
if (ui->checkExtended)
ui->checkExtended->setChecked(dbcMessage->extendedID);

for (int i = 0; i < ui->comboSender->count(); i++)
{
if (ui->comboSender->itemText(i) == dbcMessage->sender->name)
Expand Down
58 changes: 43 additions & 15 deletions ui/dbcmessageeditor.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<width>460</width>
<height>371</height>
</rect>
</property>
Expand All @@ -26,72 +26,100 @@
<item row="0" column="1">
<widget class="QLineEdit" name="lineFrameID"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineMsgName"/>
<item row="2" column="1">
<widget class="QLineEdit" name="lineMsgName">
<property name="minimumSize">
<size>
<width>390</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Message Name:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QLineEdit" name="lineFrameLen"/>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Frame Length:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_extended">
<property name="text">
<string>Frame Type:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkExtended">
<property name="text">
<string>Extended</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Text Color:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Background Color:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Comments:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lineComment"/>
<item row="7" column="1">
<widget class="QLineEdit" name="lineComment">
<property name="minimumSize">
<size>
<width>390</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Sending Node:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="1">
<widget class="QComboBox" name="comboSender">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QPushButton" name="btnTextColor">
<property name="text">
<string>Set</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QPushButton" name="btnBackgroundColor">
<property name="text">
<string>Set</string>
Expand Down