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

Controls and code for using a J1939 database.

Browse Source
This commit is contained in:
Fabián Inostroza
2017-10-22 03:35:36 -03:00
parent 9020f97784
commit 218e3141d2
3 changed files with 113 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbcloadsavewindow.cpp
+51 -3
View File
@@ -1,5 +1,6 @@
#include "dbcloadsavewindow.h"
#include "ui_dbcloadsavewindow.h"
#include <QCheckBox>
DBCLoadSaveWindow::DBCLoadSaveWindow(const QVector<CANFrame> *frames, QWidget *parent) :
QDialog(parent),
@@ -12,11 +13,13 @@ DBCLoadSaveWindow::DBCLoadSaveWindow(const QVector<CANFrame> *frames, QWidget *p
ui->setupUi(this);
QStringList header;
header << "Filename" << "Associated Bus";
ui->tableFiles->setColumnCount(2);
header << "Filename" << "Associated Bus" << "J1939";
ui->tableFiles->setColumnCount(3);
ui->tableFiles->setHorizontalHeaderLabels(header);
ui->tableFiles->setColumnWidth(0, 355);
ui->tableFiles->setColumnWidth(0, 265);
ui->tableFiles->setColumnWidth(1, 125);
ui->tableFiles->setColumnWidth(2, 80);
ui->tableFiles->horizontalHeader()->setStretchLastSection(true);
connect(ui->btnEdit, &QAbstractButton::clicked, this, &DBCLoadSaveWindow::editFile);
connect(ui->btnLoad, &QAbstractButton::clicked, this, &DBCLoadSaveWindow::loadFile);
@@ -27,6 +30,7 @@ DBCLoadSaveWindow::DBCLoadSaveWindow(const QVector<CANFrame> *frames, QWidget *p
connect(ui->btnNewDBC, &QAbstractButton::clicked, this, &DBCLoadSaveWindow::newFile);
connect(ui->tableFiles, &QTableWidget::cellChanged, this, &DBCLoadSaveWindow::cellChanged);
connect(ui->tableFiles, &QTableWidget::cellDoubleClicked, this, &DBCLoadSaveWindow::cellDoubleClicked);
//connect(ui->tableFiles, &QTableWidget::cellActivated, this, &DBCLoadSaveWindow::cellChanged);
editorWindow = new DBCMainEditor(frames);
}
@@ -43,6 +47,10 @@ void DBCLoadSaveWindow::newFile()
ui->tableFiles->insertRow(ui->tableFiles->rowCount());
ui->tableFiles->setItem(idx, 0, new QTableWidgetItem("UNNAMEDFILE"));
ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1"));
QTableWidgetItem *item = new QTableWidgetItem("");
item->setCheckState(Qt::Unchecked);
ui->tableFiles->setItem(idx, 2, item);
}
void DBCLoadSaveWindow::loadFile()
@@ -53,6 +61,17 @@ void DBCLoadSaveWindow::loadFile()
ui->tableFiles->insertRow(ui->tableFiles->rowCount());
ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename()));
ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1"));
DBC_ATTRIBUTE *attr = file->findAttributeByName("isj1939dbc");
QTableWidgetItem *item = new QTableWidgetItem("");
ui->tableFiles->setItem(idx, 2, item);
if (attr && attr->defaultValue > 0)
{
item->setCheckState(Qt::Checked);
}
else
{
item->setCheckState(Qt::Unchecked);
}
}
}
@@ -110,6 +129,35 @@ void DBCLoadSaveWindow::cellChanged(int row, int col)
file->setAssocBus(bus);
}
}
else if (col == 2)
{
DBCFile *file = dbcHandler->getFileByIdx(row);
if (file)
{
//int isj1939dbc = ui->tableFiles->item(row, col)->text().toInt();
bool isj1939dbc = ui->tableFiles->item(row, col)->checkState() == Qt::Checked;
DBC_ATTRIBUTE *attr = file->findAttributeByName("isj1939dbc");
if (attr)
{
attr->defaultValue = isj1939dbc ? 1 : 0;
file->messageHandler->setJ1939(isj1939dbc);
}
else
{
DBC_ATTRIBUTE attr;
attr.attrType = MESSAGE;
attr.defaultValue = isj1939dbc ? 1 : 0;
attr.enumVals.clear();
attr.lower = 0;
attr.upper = 0;
attr.name = "isj1939dbc";
attr.valType = QINT;
file->dbc_attributes.append(attr);
file->messageHandler->setJ1939(isj1939dbc);
}
}
}
}
void DBCLoadSaveWindow::cellDoubleClicked(int row, int col)