Addition of two new forms for DBC editing. Not done yet. The main editor window works for viewing though. Still toying with ideas for the signal editor. Very much a work in progress.

2015-06-01 21:33:32 -04:00
parent f272a26dcd
commit c2984101ee
10 changed files with 400 additions and 7 deletions
@@ -0,0 +1,144 @@
+#include "dbcmaineditor.h"
+#include "ui_dbcmaineditor.h"
+
+DBCMainEditor::DBCMainEditor(DBCHandler *handler, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DBCMainEditor)
+{
+    ui->setupUi(this);
+
+    dbcHandler = handler;
+
+    QStringList headers;
+    headers << "Node Name" << "Comment";
+    ui->NodesTable->setColumnCount(2);
+    ui->NodesTable->setColumnWidth(0, 240);
+    ui->NodesTable->setColumnWidth(1, 700);
+    ui->NodesTable->setHorizontalHeaderLabels(headers);
+    ui->NodesTable->horizontalHeader()->setStretchLastSection(true);
+
+    QStringList headers2;
+    headers2 << "Msg ID" << "Msg Name" << "Data Len" << "Signals" << "Comment";
+    ui->MessagesTable->setColumnCount(5);
+    ui->MessagesTable->setColumnWidth(0, 80);
+    ui->MessagesTable->setColumnWidth(1, 240);
+    ui->MessagesTable->setColumnWidth(2, 80);
+    ui->MessagesTable->setColumnWidth(3, 80);
+    ui->MessagesTable->setColumnWidth(4, 340);
+    ui->MessagesTable->setHorizontalHeaderLabels(headers2);
+    ui->MessagesTable->horizontalHeader()->setStretchLastSection(true);
+
+
+    refreshNodesTable();
+    refreshMessagesTable(&dbcHandler->dbc_nodes.at(0));
+    currRow = 0;
+
+    connect(ui->NodesTable, SIGNAL(cellChanged(int,int)), this, SLOT(onCellChangedNode(int,int)));
+    connect(ui->NodesTable, SIGNAL(cellClicked(int,int)), this, SLOT(onCellClickedNode(int,int)));
+
+    connect(ui->MessagesTable, SIGNAL(cellChanged(int,int)), this, SLOT(onCellChangedMessage(int,int)));
+    connect(ui->MessagesTable, SIGNAL(cellClicked(int,int)), this, SLOT(onCellClickedMessage(int,int)));
+
+    sigEditor = new DBCSignalEditor(handler);
+}
+
+DBCMainEditor::~DBCMainEditor()
+{
+    delete ui;
+    delete sigEditor;
+}
+
+void DBCMainEditor::onCellChangedNode(int row,int col)
+{
+
+}
+
+void DBCMainEditor::onCellChangedMessage(int row,int col)
+{
+
+}
+
+void DBCMainEditor::onCellClickedNode(int row, int col)
+{
+    //reload messages list if the currently selected row has changed.
+    //qDebug() << "Entered at row " << row  << " col " << col;
+    if (row != currRow)
+    {
+        currRow = row;
+        QString nodeName = ui->NodesTable->item(currRow, 0)->text();
+        qDebug() << "Trying to find node with name " << nodeName;
+        DBC_NODE *node = dbcHandler->findNodeByName(nodeName);
+        //qDebug() << "Address of node: " << (int)node;
+        refreshMessagesTable(node);
+    }
+}
+
+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(idString.toInt(NULL, 16));
+        sigEditor->setMessageRef(message);
+        sigEditor->exec(); //blocks this window from being active until we're done
+    }
+}
+
+void DBCMainEditor::refreshNodesTable()
+{
+    ui->NodesTable->clearContents(); //first step, clear out any previous crap
+    ui->NodesTable->setRowCount(0);
+
+    int rowIdx;
+
+    for (int x = 0; x < dbcHandler->dbc_nodes.count(); x++)
+    {
+        DBC_NODE node = dbcHandler->dbc_nodes.at(x);
+        QTableWidgetItem *nodeName = new QTableWidgetItem(node.name);
+        QTableWidgetItem *nodeComment = new QTableWidgetItem(node.comment);
+        rowIdx = ui->NodesTable->rowCount();
+        ui->NodesTable->insertRow(rowIdx);
+        ui->NodesTable->setItem(rowIdx, 0, nodeName);
+        ui->NodesTable->setItem(rowIdx, 1, nodeComment);
+    }
+
+    ui->NodesTable->insertRow(ui->NodesTable->rowCount());
+}
+
+void DBCMainEditor::refreshMessagesTable(const DBC_NODE *node)
+{
+    ui->MessagesTable->clearContents();
+    ui->MessagesTable->setRowCount(0);
+
+    int rowIdx;
+
+    if (node != NULL)
+    {
+        for (int x = 0; x < dbcHandler->dbc_messages.count(); x++)
+        {
+            DBC_MESSAGE msg = dbcHandler->dbc_messages.at(x);
+            if (msg.sender == node)
+            {
+                //many of these are simplistic first versions just to test functionality.
+                QTableWidgetItem *msgID = new QTableWidgetItem(QString::number(msg.ID, 16));
+                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);
+
+                rowIdx = ui->MessagesTable->rowCount();
+                ui->MessagesTable->insertRow(rowIdx);
+                ui->MessagesTable->setItem(rowIdx, 0, msgID);
+                ui->MessagesTable->setItem(rowIdx, 1, msgName);
+                ui->MessagesTable->setItem(rowIdx, 2, msgLen);
+                ui->MessagesTable->setItem(rowIdx, 3, msgSignals);
+                ui->MessagesTable->setItem(rowIdx, 4, msgComment);
+                //note that there is a sending node field in the structure but we're
+                //not displaying it. It has to be the node we selected from the node list
+                //so no need to show that here.
+            }
+        }
+    }
+
+    ui->MessagesTable->insertRow(ui->MessagesTable->rowCount());
+}