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

Major mondification to how DBC files are handled in-program. Now it is

Browse Source 
much more object oriented and encapsulated. The biggest addition is
that it is now possible to support multiple DBC files being loaded at
once with each file associated to one or both buses. Note that
currently the program still does not support multiple DBC files but
the groundwork is there.
This commit is contained in:
Collin Kidder
2016-01-17 13:30:42 -05:00
parent d831f985f5
commit cd5f851f35
11 changed files with 760 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbcmaineditor.cpp
+34 -34
View File
@@ -54,8 +54,8 @@ void DBCMainEditor::showEvent(QShowEvent* event)
inhibitCellChanged = true;
refreshNodesTable();
if (dbcHandler->dbc_nodes.count() > 0)
refreshMessagesTable(&dbcHandler->dbc_nodes.at(0));
if (dbcHandler->getFileByIdx(0)->dbc_nodes.count() > 0)
refreshMessagesTable(&dbcHandler->getFileByIdx(0)->dbc_nodes.at(0));
currRow = 0;
inhibitCellChanged = false;
@@ -123,9 +123,9 @@ void DBCMainEditor::deleteCurrentNode()
if (nodeName.length() > 0 && nodeName.compare("Vector__XXX", Qt::CaseInsensitive) != 0)
{
ui->NodesTable->removeRow(thisRow);
dbcHandler->dbc_nodes.removeAt(thisRow);
dbcHandler->getFileByIdx(0)->dbc_nodes.removeAt(thisRow);
inhibitCellChanged = true;
refreshMessagesTable(&dbcHandler->dbc_nodes[0]);
refreshMessagesTable(&dbcHandler->getFileByIdx(0)->dbc_nodes[0]);
ui->NodesTable->selectRow(0);
inhibitCellChanged = false;
}
@@ -137,7 +137,7 @@ void DBCMainEditor::deleteCurrentMessage()
if (ui->MessagesTable->item(thisRow, 0)->text().length() > 0)
{
ui->MessagesTable->removeRow(thisRow);
dbcHandler->dbc_messages.removeAt(thisRow);
dbcHandler->getFileByIdx(0)->messageHandler->removeMessageByIndex(thisRow);
}
}
@@ -156,7 +156,7 @@ void DBCMainEditor::onCellChangedNode(int row,int col)
QString newName = ui->NodesTable->item(row, col)->text().simplified().replace(' ', '_');
qDebug() << "new name: " << newName;
if (newName.length() == 0) return;
if (dbcHandler->findNodeByName(newName) != NULL) //duplicates an existing node!
if (dbcHandler->getFileByIdx(0)->findNodeByName(newName) != NULL) //duplicates an existing node!
{
QMessageBox msg;
msg.setParent(0);
@@ -165,8 +165,8 @@ void DBCMainEditor::onCellChangedNode(int row,int col)
return;
}
newNode.name = newName;
dbcHandler->dbc_nodes.append(newNode);
qDebug() << "# of nodes now " << dbcHandler->dbc_nodes.count();
dbcHandler->getFileByIdx(0)->dbc_nodes.append(newNode);
qDebug() << "# of nodes now " << dbcHandler->getFileByIdx(0)->dbc_nodes.count();
QTableWidgetItem *widgetName = new QTableWidgetItem(newName);
inhibitCellChanged = true;
ui->NodesTable->setItem(row, col, widgetName);
@@ -178,7 +178,7 @@ void DBCMainEditor::onCellChangedNode(int row,int col)
{
if (col == 0)
{
DBC_NODE *oldNode = dbcHandler->findNodeByIdx(row);
DBC_NODE *oldNode = dbcHandler->getFileByIdx(0)->findNodeByIdx(row);
QString nodeName = ui->NodesTable->item(row, col)->text().simplified().replace(' ', '_');
if (oldNode == NULL) return;
if (row != 0) oldNode->name = nodeName;
@@ -192,7 +192,7 @@ void DBCMainEditor::onCellChangedNode(int row,int col)
{
QString nodeName = ui->NodesTable->item(row, 0)->text().simplified().replace(' ', '_');
qDebug() << "searching for node " << nodeName;
DBC_NODE *thisNode = dbcHandler->findNodeByName(nodeName);
DBC_NODE *thisNode = dbcHandler->getFileByIdx(0)->findNodeByName(nodeName);
if (thisNode == NULL) return;
thisNode->comment = ui->NodesTable->item(row, col)->text().simplified();
qDebug() << "New comment: " << thisNode->comment;
@@ -213,7 +213,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
int msgLen;
QString msgComment;
DBC_MESSAGE newMsg;
DBC_NODE *node = dbcHandler->findNodeByIdx(ui->NodesTable->currentRow());
DBC_NODE *node = dbcHandler->getFileByIdx(0)->findNodeByIdx(ui->NodesTable->currentRow());
DBC_MESSAGE *msg;
if (node == NULL)
{
@@ -224,14 +224,14 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
msgID = Utility::ParseStringToNum(ui->MessagesTable->item(row, 0)->text());
qDebug() << "Msg ID of edited: " << msgID;
msg = dbcHandler->findMsgByID(msgID);
msg = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByID(msgID);
switch(col)
{
case 0: //msg id
if (row == ui->MessagesTable->rowCount() - 1) //new record
{
if (dbcHandler->findMsgByID(msgID) != NULL)
if (dbcHandler->getFileByIdx(0)->messageHandler->findMsgByID(msgID) != NULL)
{
QMessageBox msg;
msg.setParent(0);
@@ -251,7 +251,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
break;
}
}
dbcHandler->dbc_messages.append(newMsg);
dbcHandler->getFileByIdx(0)->messageHandler->addMessage(newMsg);
}
else //editing an existing record
{
@@ -270,7 +270,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
if (msgName.length() == 0) return;
if (row == ui->MessagesTable->rowCount() - 1) //new record
{
if (dbcHandler->findMsgByName(msgName) != NULL)
if (dbcHandler->getFileByIdx(0)->messageHandler->findMsgByName(msgName) != NULL)
{
QMessageBox msg;
msg.setParent(0);
@@ -281,7 +281,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
newMsg.ID = -1;
newMsg.name = msgName;
newMsg.sender = node;
dbcHandler->dbc_messages.append(newMsg);
dbcHandler->getFileByIdx(0)->messageHandler->addMessage(newMsg);
}
else
{
@@ -304,7 +304,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
newMsg.name = "";
newMsg.len = msgLen;
newMsg.sender = node;
dbcHandler->dbc_messages.append(newMsg);
dbcHandler->getFileByIdx(0)->messageHandler->addMessage(newMsg);
}
else //editing an existing record
{
@@ -328,7 +328,7 @@ void DBCMainEditor::onCellChangedMessage(int row,int col)
newMsg.len = 0;
newMsg.comment = msgComment;
newMsg.sender = node;
dbcHandler->dbc_messages.append(newMsg);
dbcHandler->getFileByIdx(0)->messageHandler->addMessage(newMsg);
}
else //editing an existing record
{
@@ -363,7 +363,7 @@ void DBCMainEditor::onCellClickedNode(int row, int col)
nodeName = item->text();
qDebug() << "Trying to find node with name " << nodeName;
DBC_NODE *node = dbcHandler->findNodeByName(nodeName);
DBC_NODE *node = dbcHandler->getFileByIdx(0)->findNodeByName(nodeName);
//qDebug() << "Address of node: " << (int)node;
inhibitCellChanged = true;
refreshMessagesTable(node);
@@ -376,12 +376,12 @@ void DBCMainEditor::onCellClickedMessage(int row, int col)
if (col == 3) //3 is the signals field. If clicked we go to the signals dialog
{
QString idString = ui->MessagesTable->item(row, 0)->text();
DBC_MESSAGE *message = dbcHandler->findMsgByID(Utility::ParseStringToNum(idString));
DBC_MESSAGE *message = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByID(Utility::ParseStringToNum(idString));
sigEditor->setMessageRef(message);
sigEditor->exec(); //blocks this window from being active until we're done
//now update the displayed # of signals
inhibitCellChanged = true;
QTableWidgetItem *replacement = new QTableWidgetItem(QString::number(message->msgSignals.count()));
inhibitCellChanged = true;
QTableWidgetItem *replacement = new QTableWidgetItem(QString::number(message->sigHandler->getCount()));
ui->MessagesTable->setItem(row, col, replacement);
inhibitCellChanged = false;
}
@@ -394,17 +394,17 @@ void DBCMainEditor::refreshNodesTable()
int rowIdx;
if (dbcHandler->findNodeByName("Vector__XXX") == NULL)
if (dbcHandler->getFileByIdx(0)->findNodeByName("Vector__XXX") == NULL)
{
DBC_NODE newNode;
newNode.name = "Vector__XXX";
newNode.comment = "Default node if no other node is specified";
dbcHandler->dbc_nodes.append(newNode);
dbcHandler->getFileByIdx(0)->dbc_nodes.append(newNode);
}
for (int x = 0; x < dbcHandler->dbc_nodes.count(); x++)
for (int x = 0; x < dbcHandler->getFileByIdx(0)->dbc_nodes.count(); x++)
{
DBC_NODE node = dbcHandler->dbc_nodes.at(x);
DBC_NODE node = dbcHandler->getFileByIdx(0)->dbc_nodes.at(x);
QTableWidgetItem *nodeName = new QTableWidgetItem(node.name);
QTableWidgetItem *nodeComment = new QTableWidgetItem(node.comment);
rowIdx = ui->NodesTable->rowCount();
@@ -428,17 +428,17 @@ void DBCMainEditor::refreshMessagesTable(const DBC_NODE *node)
if (node != NULL)
{
for (int x = 0; x < dbcHandler->dbc_messages.count(); x++)
for (int x = 0; x < dbcHandler->getFileByIdx(0)->messageHandler->getCount(); x++)
{
DBC_MESSAGE msg = dbcHandler->dbc_messages.at(x);
if (msg.sender == node)
DBC_MESSAGE *msg = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByIdx(x);
if (msg->sender == node)
{
//many of these are simplistic first versions just to test functionality.
QTableWidgetItem *msgID = new QTableWidgetItem(Utility::formatNumber(msg.ID));
QTableWidgetItem *msgName = new QTableWidgetItem(msg.name);
QTableWidgetItem *msgLen = new QTableWidgetItem(QString::number(msg.len));
QTableWidgetItem *msgSignals = new QTableWidgetItem(QString::number(msg.msgSignals.count()));
QTableWidgetItem *msgComment = new QTableWidgetItem(msg.comment);
QTableWidgetItem *msgID = new QTableWidgetItem(Utility::formatNumber(msg->ID));
QTableWidgetItem *msgName = new QTableWidgetItem(msg->name);
QTableWidgetItem *msgLen = new QTableWidgetItem(QString::number(msg->len));
QTableWidgetItem *msgSignals = new QTableWidgetItem(QString::number(msg->sigHandler->getCount()));
QTableWidgetItem *msgComment = new QTableWidgetItem(msg->comment);
rowIdx = ui->MessagesTable->rowCount();
ui->MessagesTable->insertRow(rowIdx);