Andy Huska
ab476c746e
...to graphing window and signal viewer so complex systems with message name duplication (eg "Status") works well. DBCHandler class has a new function to find a msg by fully qualified node name...Utility class defines the qualified name seperator, right now it is :: and is used thusly filenameNoExtension::nodeName for display in the node dropdown (because nodes can be common between dbc files). To get the message from the system you use the findMessage function in dbchandler and pass the msgName and the fully qualified node name. This is about as unique as we can get, second only to message ID. Added node comboBox to graph signal editor for easier data filtering (took the same implementation that was in signal viewer, and tuned up both of them)
501 lines
16 KiB
C++
501 lines
16 KiB
C++
#include "newgraphdialog.h"
|
|
#include "ui_newgraphdialog.h"
|
|
#include <QColorDialog>
|
|
#include <QRandomGenerator>
|
|
#include "utility.h"
|
|
#include "helpwindow.h"
|
|
|
|
NewGraphDialog::NewGraphDialog(DBCHandler *handler, QWidget *parent) :
|
|
QDialog(parent),
|
|
ui(new Ui::NewGraphDialog)
|
|
{
|
|
ui->setupUi(this);
|
|
|
|
dbcHandler = handler;
|
|
|
|
connect(ui->colorSwatch, SIGNAL(clicked(bool)), this, SLOT(colorSwatchClick()));
|
|
connect(ui->fillSwatch, SIGNAL(clicked(bool)), this, SLOT(fillSwatchClick()));
|
|
connect(ui->btnAddGraph, SIGNAL(clicked(bool)), this, SLOT(addButtonClicked()));
|
|
|
|
QPalette p = ui->colorSwatch->palette();
|
|
//using 160 instead of 255 so that colors are always at least a little dark
|
|
p.setColor(QPalette::Button, QColor(QRandomGenerator::global()->bounded(160),QRandomGenerator::global()->bounded(160), QRandomGenerator::global()->bounded(160)));
|
|
ui->colorSwatch->setPalette(p);
|
|
|
|
QPalette p2 = ui->fillSwatch->palette();
|
|
p2.setColor(QPalette::Button, QColor(128,128,128,0)); //light gray, no opacity so it is disabled by default
|
|
ui->fillSwatch->setPalette(p2);
|
|
|
|
ui->coPointStyle->addItem("None");
|
|
ui->coPointStyle->addItem("Dot");
|
|
ui->coPointStyle->addItem("Cross");
|
|
ui->coPointStyle->addItem("Plus");
|
|
ui->coPointStyle->addItem("Circle");
|
|
ui->coPointStyle->addItem("Disc");
|
|
ui->coPointStyle->addItem("Square");
|
|
ui->coPointStyle->addItem("Diamond");
|
|
ui->coPointStyle->addItem("Star");
|
|
ui->coPointStyle->addItem("Triangle");
|
|
ui->coPointStyle->addItem("TriangleInverted");
|
|
ui->coPointStyle->addItem("Cross Inside Square");
|
|
ui->coPointStyle->addItem("Plus Inside Square");
|
|
ui->coPointStyle->addItem("Cross Inside Circle");
|
|
ui->coPointStyle->addItem("Plus Inside Circle");
|
|
ui->coPointStyle->addItem("Peace Sign");
|
|
|
|
connect(ui->cbNodes, SIGNAL(currentIndexChanged(int)), this, SLOT(loadMessages(int)));
|
|
connect(ui->cbMessages, SIGNAL(currentIndexChanged(int)), this, SLOT(loadSignals(int)));
|
|
connect(ui->gridData, SIGNAL(gridClicked(int)), this, SLOT(bitfieldClicked(int)));
|
|
connect(ui->txtDataLen, SIGNAL(textChanged(QString)), this, SLOT(handleDataLenUpdate()));
|
|
connect(ui->cbIntel, SIGNAL(toggled(bool)), this, SLOT(drawBitfield()));
|
|
connect(ui->btnCopySignal, SIGNAL(clicked(bool)), this, SLOT(copySignalToParamsUI()));
|
|
connect(ui->cbSignals, SIGNAL(currentIndexChanged(int)), this, SLOT(drawBitfield()));
|
|
|
|
startBit = 0;
|
|
dataLen = 1;
|
|
assocSignal = nullptr;
|
|
|
|
loadNodes();
|
|
|
|
installEventFilter(this);
|
|
}
|
|
|
|
NewGraphDialog::~NewGraphDialog()
|
|
{
|
|
removeEventFilter(this);
|
|
delete ui;
|
|
}
|
|
|
|
void NewGraphDialog::showEvent(QShowEvent* event)
|
|
{
|
|
QDialog::showEvent(event);
|
|
if(shownFromPlotEdit == false)
|
|
loadNodes();
|
|
drawBitfield();
|
|
qDebug() << "S" << ui->gridData->geometry();
|
|
}
|
|
|
|
bool NewGraphDialog::eventFilter(QObject *obj, QEvent *event)
|
|
{
|
|
if (event->type() == QEvent::KeyRelease) {
|
|
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
|
|
switch (keyEvent->key())
|
|
{
|
|
case Qt::Key_F1:
|
|
HelpWindow::getRef()->showHelp("graphsetup.md");
|
|
break;
|
|
}
|
|
return true;
|
|
} else {
|
|
// standard event processing
|
|
return QObject::eventFilter(obj, event);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void NewGraphDialog::addButtonClicked()
|
|
{
|
|
accept();
|
|
}
|
|
|
|
void NewGraphDialog::colorSwatchClick()
|
|
{
|
|
QColor newColor = QColorDialog::getColor(ui->colorSwatch->palette().button().color());
|
|
|
|
QPalette p = ui->colorSwatch->palette();
|
|
p.setColor(QPalette::Button, newColor);
|
|
ui->colorSwatch->setPalette(p);
|
|
}
|
|
|
|
void NewGraphDialog::fillSwatchClick()
|
|
{
|
|
QColor newColor = QColorDialog::getColor(ui->fillSwatch->palette().button().color(), nullptr, "Pick A Color", QColorDialog::ShowAlphaChannel);
|
|
|
|
QPalette p = ui->fillSwatch->palette();
|
|
p.setColor(QPalette::Button, newColor);
|
|
ui->fillSwatch->setPalette(p);
|
|
}
|
|
|
|
//check whether the current values on the left match the signal selected on the right
|
|
void NewGraphDialog::checkSignalAgreement()
|
|
{
|
|
GraphParams testingParams;
|
|
bool bAgree = true;
|
|
bool sigSigned = false;
|
|
DBC_SIGNAL *sig = nullptr;
|
|
DBC_MESSAGE *msg = nullptr;
|
|
|
|
if (dbcHandler == nullptr) return;
|
|
if (dbcHandler->getFileCount() == 0) return;
|
|
|
|
QString fullyQualifiedNodeName = ui->cbNodes->itemText(ui->cbNodes->currentIndex());
|
|
QString msgName = ui->cbMessages->currentText();
|
|
msg = dbcHandler->findMessage(msgName, fullyQualifiedNodeName);
|
|
if (msg)
|
|
{
|
|
sig = msg->sigHandler->findSignalByName(ui->cbSignals->currentText());
|
|
}
|
|
else
|
|
{
|
|
ui->lblMsgStatus->setText("Msg ID doesn't exist in DBC");
|
|
return;
|
|
}
|
|
|
|
if (sig)
|
|
{
|
|
if (sig->valType == SIGNED_INT) sigSigned = true;
|
|
|
|
testingParams.ID = Utility::ParseStringToNum(ui->txtID->text());
|
|
testingParams.bias = ui->txtBias->text().toFloat();
|
|
testingParams.isSigned = ui->cbSigned->isChecked();
|
|
testingParams.intelFormat = ui->cbIntel->isChecked();
|
|
testingParams.scale = ui->txtScale->text().toFloat();
|
|
testingParams.startBit = startBit;
|
|
testingParams.numBits = dataLen;
|
|
|
|
if (testingParams.ID != msg->ID)
|
|
bAgree = false;
|
|
if (fabs(testingParams.bias - sig->bias) > 0.01)
|
|
bAgree = false;
|
|
if (testingParams.isSigned != sigSigned)
|
|
bAgree = false;
|
|
if (testingParams.intelFormat != sig->intelByteOrder)
|
|
bAgree = false;
|
|
if (fabs(testingParams.scale - sig->factor) > 0.01)
|
|
bAgree = false;
|
|
if (testingParams.startBit != sig->startBit)
|
|
bAgree = false;
|
|
if (testingParams.numBits != sig->signalSize)
|
|
bAgree = false;
|
|
}
|
|
else
|
|
{
|
|
ui->lblMsgStatus->setText("Signal name doesn't exist in DBC");
|
|
return;
|
|
}
|
|
|
|
if (bAgree)
|
|
{
|
|
ui->lblMsgStatus->setText("Graph params match this signal");
|
|
//assocSignal = sig;
|
|
}
|
|
else
|
|
{
|
|
ui->lblMsgStatus->setText("Signal and Graph Params do not match");
|
|
//assocSignal = nullptr; //ya done broke it, null the associated signal since the user is changing things
|
|
}
|
|
}
|
|
|
|
void NewGraphDialog::clearParams()
|
|
{
|
|
ui->txtID->clear();
|
|
ui->txtBias->clear();
|
|
ui->txtMask->clear();
|
|
ui->txtScale->clear();
|
|
ui->txtStride->clear();
|
|
ui->txtName->clear();
|
|
}
|
|
|
|
void NewGraphDialog::setParams(GraphParams ¶ms)
|
|
{
|
|
shownFromPlotEdit = true;
|
|
|
|
ui->txtBias->setText(QString::number(params.bias));
|
|
ui->txtMask->setText(Utility::formatNumber(params.mask));
|
|
ui->txtScale->setText(QString::number(params.scale));
|
|
ui->txtStride->setText(QString::number(params.stride));
|
|
ui->cbSigned->setChecked(params.isSigned);
|
|
ui->cbIntel->setChecked(params.intelFormat);
|
|
|
|
startBit = params.startBit;
|
|
dataLen = params.numBits;
|
|
ui->txtDataLen->setText(QString::number(dataLen));
|
|
ui->txtID->setText(Utility::formatCANID(params.ID));
|
|
ui->txtName->setText(params.graphName);
|
|
ui->editBus->setText(QString::number(params.bus));
|
|
QPalette p = ui->colorSwatch->palette();
|
|
p.setColor(QPalette::Button, params.lineColor);
|
|
ui->colorSwatch->setPalette(p);
|
|
QPalette p2 = ui->fillSwatch->palette();
|
|
p2.setColor(QPalette::Button, params.fillColor);
|
|
ui->fillSwatch->setPalette(p2);
|
|
ui->cbOnlyPoints->setChecked(params.drawOnlyPoints);
|
|
ui->spinLineWidth->setValue(params.lineWidth);
|
|
ui->coPointStyle->setCurrentIndex(params.pointType);
|
|
|
|
assocSignal = params.associatedSignal;
|
|
|
|
loadNodes();
|
|
|
|
auto msg = assocSignal->parentMessage;
|
|
auto node = msg->sender;
|
|
|
|
bool nodeFound = false;
|
|
for(int i=0; i<ui->cbNodes->count(); i++)
|
|
{
|
|
if(ui->cbNodes->itemText(i) == node->sourceFileName + Utility::fullyQualifiedNameSeperator + node->name)
|
|
{
|
|
ui->cbNodes->setCurrentIndex(i);
|
|
nodeFound = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
qDebug() << "Matching plot params to Node: " << nodeFound;
|
|
|
|
if(nodeFound)
|
|
{
|
|
bool msgFound = false;
|
|
for(int i=0; i<ui->cbMessages->count(); i++)
|
|
{
|
|
if(ui->cbMessages->itemText(i) == msg->name)
|
|
{
|
|
ui->cbMessages->setCurrentIndex(i);
|
|
msgFound = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
qDebug() << "Matching plot params to Msg: " << msgFound;
|
|
|
|
if(msgFound)
|
|
{
|
|
bool sigFound = false;
|
|
for(int i=0; i<ui->cbSignals->count(); i++)
|
|
{
|
|
if(ui->cbSignals->itemText(i) == assocSignal->name)
|
|
{
|
|
ui->cbSignals->setCurrentIndex(i);
|
|
sigFound = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
qDebug() << "Matching plot params to Signal: " << sigFound;
|
|
}
|
|
}
|
|
//ui->cbNodes->model()->
|
|
|
|
|
|
//loadSignals(0);
|
|
drawBitfield();
|
|
checkSignalAgreement();
|
|
}
|
|
|
|
void NewGraphDialog::getParams(GraphParams ¶ms)
|
|
{
|
|
params.lineColor = ui->colorSwatch->palette().button().color();
|
|
params.fillColor = ui->fillSwatch->palette().button().color();
|
|
params.graphName = ui->txtName->text();
|
|
|
|
params.lineWidth = ui->spinLineWidth->value();
|
|
params.drawOnlyPoints = ui->cbOnlyPoints->isChecked();
|
|
params.pointType = ui->coPointStyle->currentIndex();
|
|
|
|
params.ID = Utility::ParseStringToNum(ui->txtID->text());
|
|
params.bias = ui->txtBias->text().toFloat();
|
|
params.isSigned = ui->cbSigned->isChecked();
|
|
params.intelFormat = ui->cbIntel->isChecked();
|
|
params.mask = Utility::ParseStringToNum(ui->txtMask->text());
|
|
params.scale = ui->txtScale->text().toFloat();
|
|
params.stride = Utility::ParseStringToNum(ui->txtStride->text());
|
|
params.bus = Utility::ParseStringToNum(ui->editBus->text());
|
|
|
|
params.startBit = startBit;
|
|
params.numBits = dataLen;
|
|
|
|
params.associatedSignal = assocSignal;
|
|
|
|
//now catch stupidity and bring it to defaults
|
|
if (params.mask == 0) params.mask = 0xFFFFFFFF;
|
|
if (fabs(params.scale) < 0.00000001) params.scale = 1.0f;
|
|
if (params.stride < 1) params.stride = 1;
|
|
}
|
|
|
|
void NewGraphDialog::loadNodes()
|
|
{
|
|
int numFiles;
|
|
ui->cbNodes->clear();
|
|
if (dbcHandler == nullptr) return;
|
|
if ((numFiles = dbcHandler->getFileCount()) == 0) return;
|
|
qDebug() << numFiles;
|
|
for (int f = 0; f < numFiles; f++)
|
|
{
|
|
DBCFile* thisFile = dbcHandler->getFileByIdx(f);
|
|
qDebug() << thisFile->messageHandler->getCount();
|
|
|
|
QList<QString> names;
|
|
|
|
for (int x = 0; x < thisFile->dbc_nodes.count(); x++)
|
|
{
|
|
bool messagesInNode = false;
|
|
for (int m = 0; m < thisFile->messageHandler->getCount(); m++)
|
|
{
|
|
if(thisFile->messageHandler->findMsgByIdx(m)->sender->name == thisFile->dbc_nodes[x].name)
|
|
{
|
|
messagesInNode = true;
|
|
break;
|
|
}
|
|
}
|
|
if(messagesInNode)
|
|
{
|
|
QString fullyQualifiedNodeName = thisFile->getFilenameNoExt() + Utility::fullyQualifiedNameSeperator + thisFile->dbc_nodes[x].name;
|
|
names.append(fullyQualifiedNodeName);
|
|
}
|
|
}
|
|
|
|
if(names.count() > 0)
|
|
{
|
|
names.sort();
|
|
ui->cbNodes->addItem("----" + thisFile->getFilename());
|
|
Utility::SetComboBoxItemEnabled(ui->cbNodes, ui->cbNodes->count() -1, false);
|
|
for(int i=0; i<names.count(); i++)
|
|
ui->cbNodes->addItem(names[i]);
|
|
}
|
|
}
|
|
}
|
|
|
|
void NewGraphDialog::loadMessages(int idx)
|
|
{
|
|
int numFiles = 0;
|
|
DBC_MESSAGE *msg;
|
|
ui->cbMessages->clear();
|
|
if (dbcHandler == nullptr) return;
|
|
if ((numFiles = dbcHandler->getFileCount()) == 0) return;
|
|
qDebug() << numFiles;
|
|
|
|
QString displayedNodeName = ui->cbNodes->itemText(idx);
|
|
|
|
for (int f = 0; f < numFiles; f++)
|
|
{
|
|
qDebug() << dbcHandler->getFileByIdx(f)->messageHandler->getCount();
|
|
|
|
for (int x = 0; x < dbcHandler->getFileByIdx(f)->messageHandler->getCount(); x++)
|
|
{
|
|
QString fullyQualifiedNodeName = dbcHandler->getFileByIdx(f)->getFilenameNoExt() + Utility::fullyQualifiedNameSeperator + dbcHandler->getFileByIdx(f)->messageHandler->findMsgByIdx(x)->sender->name;
|
|
if(fullyQualifiedNodeName == displayedNodeName)
|
|
ui->cbMessages->addItem(dbcHandler->getFileByIdx(f)->messageHandler->findMsgByIdx(x)->name);
|
|
}
|
|
}
|
|
}
|
|
|
|
void NewGraphDialog::loadSignals(int idx)
|
|
{
|
|
Q_UNUSED(idx);
|
|
|
|
ui->cbSignals->clear();
|
|
|
|
//search through all DBC files in order to try to find a message with the given name
|
|
QString fullyQualifiedNodeName = ui->cbNodes->itemText(ui->cbNodes->currentIndex());
|
|
DBC_MESSAGE *msg = dbcHandler->findMessage(ui->cbMessages->currentText(), fullyQualifiedNodeName);
|
|
if (msg == nullptr) return;
|
|
|
|
DBC_SIGNAL *sig;
|
|
for (int x = 0; x < msg->sigHandler->getCount(); x++)
|
|
{
|
|
sig = msg->sigHandler->findSignalByIdx(x);
|
|
if (sig)
|
|
{
|
|
ui->cbSignals->addItem(sig->name);
|
|
if (assocSignal && sig->name == assocSignal->name)
|
|
{
|
|
ui->cbSignals->setCurrentIndex(ui->cbSignals->count() - 1);
|
|
//qDebug() << "Found me";
|
|
}
|
|
}
|
|
}
|
|
ui->cbSignals->model()->sort(0);
|
|
checkSignalAgreement();
|
|
}
|
|
|
|
void NewGraphDialog::bitfieldClicked(int bit)
|
|
{
|
|
qDebug() << "Clicked bit: " << bit;
|
|
startBit = bit;
|
|
drawBitfield();
|
|
}
|
|
|
|
void NewGraphDialog::drawBitfield()
|
|
{
|
|
qDebug() << "Draw Bitfield";
|
|
uint8_t bitField[64];
|
|
int endBit, sBit;
|
|
|
|
memset(bitField, 0, 64);
|
|
|
|
//make the start bit a different color to set it apart
|
|
bitField[Utility::getByteFromBitPosition(startBit)] |= 1 << Utility::getBitFromBitPosition(startBit);
|
|
|
|
ui->gridData->setReference((unsigned char *)&bitField, false);
|
|
|
|
if (ui->cbIntel->isChecked())
|
|
{
|
|
endBit = startBit + dataLen - 1;
|
|
if (startBit < 0) startBit = 0;
|
|
if (endBit > 511) endBit = 511;
|
|
for (int y = startBit; y <= endBit; y++)
|
|
{
|
|
//bitField |= 1ull << y;
|
|
bitField[Utility::getByteFromBitPosition(y)] |= 1 << Utility::getBitFromBitPosition(y);
|
|
}
|
|
}
|
|
else //big endian / motorola format
|
|
{
|
|
//much more irritating than the intel version...
|
|
int size = dataLen;
|
|
sBit = startBit;
|
|
while (size > 0)
|
|
{
|
|
//bitField |= 1ull << sBit;
|
|
bitField[Utility::getByteFromBitPosition(sBit)] |= 1 << Utility::getBitFromBitPosition(sBit);
|
|
size--;
|
|
if ((sBit % 8) == 0) sBit += 15;
|
|
else sBit--;
|
|
if (sBit > 511) sBit = 511;
|
|
}
|
|
}
|
|
|
|
ui->gridData->updateData((unsigned char *)&bitField, true);
|
|
|
|
checkSignalAgreement();
|
|
}
|
|
|
|
void NewGraphDialog::handleDataLenUpdate()
|
|
{
|
|
dataLen = ui->txtDataLen->text().toInt();
|
|
if (dataLen < 1) dataLen = 1;
|
|
if (dataLen > 64) dataLen = 64;
|
|
drawBitfield();
|
|
checkSignalAgreement();
|
|
}
|
|
|
|
void NewGraphDialog::copySignalToParamsUI()
|
|
{
|
|
assocSignal = nullptr;
|
|
DBC_MESSAGE *msg = nullptr;
|
|
|
|
QString fullyQualifiedNodeName = ui->cbNodes->itemText(ui->cbNodes->currentIndex());
|
|
QString msgName = ui->cbMessages->itemText(ui->cbMessages->currentIndex());
|
|
|
|
msg = dbcHandler->findMessage(msgName, fullyQualifiedNodeName);
|
|
|
|
if (!msg) return;
|
|
DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(ui->cbSignals->currentText());
|
|
if (!sig) return;
|
|
|
|
startBit = sig->startBit;
|
|
ui->txtBias->setText(QString::number(sig->bias));
|
|
ui->txtDataLen->setText(QString::number(sig->signalSize));
|
|
ui->txtID->setText(Utility::formatCANID(msg->ID));
|
|
ui->txtMask->setText("0xFFFFFFFF");
|
|
ui->txtName->setText(sig->name);
|
|
ui->txtScale->setText(QString::number(sig->factor));
|
|
ui->txtStride->setText("1");
|
|
ui->cbIntel->setChecked(sig->intelByteOrder);
|
|
if (sig->valType == SIGNED_INT) ui->cbSigned->setChecked(true);
|
|
else ui->cbSigned->setChecked(false);
|
|
drawBitfield();
|
|
assocSignal = sig;
|
|
checkSignalAgreement();
|
|
}
|