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

Graphing window now respects bus number. Set to -1 to allow any bus or

Browse Source 
to 0 or a positive number to lock a graph to a specific bus.
This commit is contained in:
Collin Kidder
2022-11-29 21:15:38 -05:00
parent 708d8bde8b
commit e1c4046bf1
5 changed files with 89 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef CONFIG #ifndef CONFIG
#define CONFIG #define CONFIG
#define VERSION 207 #define VERSION 208
//try to keep this in sync. //try to keep this in sync.
//SavvyCAN will complain if you connect a GVRET board with a revision //SavvyCAN will complain if you connect a GVRET board with a revision
re/graphingwindow.cpp
+58 -5
View File
@@ -210,7 +210,7 @@ void GraphingWindow::updatedFrames(int numFrames)
for (int i = modelFrames->count() - numFrames; i < modelFrames->count(); i++) for (int i = modelFrames->count() - numFrames; i < modelFrames->count(); i++)
{ {
thisFrame = modelFrames->at(i); thisFrame = modelFrames->at(i);
if (graphParams[j].ID == thisFrame.frameId()) if ( graphParams[j].ID == thisFrame.frameId() && ( (graphParams[j].bus == -1) || (graphParams[j].bus == thisFrame.bus) ) )
{ {
appendToGraph(graphParams[j], thisFrame, x, y); appendToGraph(graphParams[j], thisFrame, x, y);
appendedToGraph = true; appendedToGraph = true;
@@ -614,7 +614,8 @@ void GraphingWindow::removeAllGraphs()
QMessageBox::StandardButton confirmDialog; QMessageBox::StandardButton confirmDialog;
confirmDialog = QMessageBox::question(this, "Really?", "Remove all graphs?", confirmDialog = QMessageBox::question(this, "Really?", "Remove all graphs?",
QMessageBox::Yes|QMessageBox::No); QMessageBox::Yes|QMessageBox::No);
if (confirmDialog == QMessageBox::Yes) { if (confirmDialog == QMessageBox::Yes)
{
ui->graphingView->clearGraphs(); ui->graphingView->clearGraphs();
ui->graphingView->clearItems(); ui->graphingView->clearItems();
graphParams.clear(); graphParams.clear();
@@ -885,7 +886,7 @@ void GraphingWindow::saveDefinitions()
QList<GraphParams>::iterator iter; QList<GraphParams>::iterator iter;
for (iter = graphParams.begin(); iter != graphParams.end(); ++iter) for (iter = graphParams.begin(); iter != graphParams.end(); ++iter)
{ {
outFile->write("X,"); outFile->write("Z,");
outFile->write(QString::number(iter->ID, 16).toUtf8()); outFile->write(QString::number(iter->ID, 16).toUtf8());
outFile->putChar(','); outFile->putChar(',');
outFile->write(QString::number(iter->mask, 16).toUtf8()); outFile->write(QString::number(iter->mask, 16).toUtf8());
@@ -904,6 +905,8 @@ void GraphingWindow::saveDefinitions()
outFile->putChar(','); outFile->putChar(',');
outFile->write(QString::number(iter->stride).toUtf8()); outFile->write(QString::number(iter->stride).toUtf8());
outFile->putChar(','); outFile->putChar(',');
outFile->write(QString::number(iter->bus).toUtf8());
outFile->putChar(',');
outFile->write(QString::number(iter->lineColor.red()).toUtf8()); outFile->write(QString::number(iter->lineColor.red()).toUtf8());
outFile->putChar(','); outFile->putChar(',');
outFile->write(QString::number(iter->lineColor.green()).toUtf8()); outFile->write(QString::number(iter->lineColor.green()).toUtf8());
@@ -978,7 +981,56 @@ void GraphingWindow::loadDefinitions()
gp.associatedSignal = nullptr; //might not be saved in the graph definition so default it to nothing gp.associatedSignal = nullptr; //might not be saved in the graph definition so default it to nothing
if (tokens[0] == "X") //newest format based around signals //should probably do better at merging all the code that is the same between all these formats instead of duplication...
if (tokens[0] == "Z") //very newest format, adds ability to set bus number
{
gp.ID = tokens[1].toUInt(nullptr, 16);
gp.mask = tokens[2].toULongLong(nullptr, 16);
gp.startBit = tokens[3].toInt();
if (gp.startBit < 0) {
gp.intelFormat = false;
gp.startBit *= -1;
}
else gp.intelFormat = true;
gp.numBits = tokens[4].toInt();
if (tokens[5] == "Y") gp.isSigned = true;
else gp.isSigned = false;
gp.bias = tokens[6].toFloat();
gp.scale = tokens[7].toFloat();
gp.stride = tokens[8].toInt();
gp.bus = tokens[9].toInt();
gp.lineColor.setRed( tokens[10].toInt() );
gp.lineColor.setGreen( tokens[11].toInt() );
gp.lineColor.setBlue( tokens[12].toInt() );
if (tokens.length() > 13)
gp.graphName = tokens[13];
else
gp.graphName = QString();
if (tokens.length() > 20) //even newer format with extra graph formatting options
{
gp.fillColor.setRed( tokens[14].toInt() );
gp.fillColor.setGreen( tokens[15].toInt() );
gp.fillColor.setBlue( tokens[16].toInt() );
gp.fillColor.setAlpha( tokens[17].toInt() );
if (tokens[18] == "Y") gp.drawOnlyPoints = true;
else gp.drawOnlyPoints = false;
gp.pointType = tokens[19].toInt();
gp.lineWidth = tokens[20].toInt();
}
if (tokens.length() > 22)
{
DBC_MESSAGE *msg = dbcHandler->findMessage(QString(tokens[21]));
if (msg)
{
gp.associatedSignal = msg->sigHandler->findSignalByName(tokens[22]);
}
else qDebug() << "Couldn't find the message by name! " << tokens[21] << " " << tokens[22];
}
createGraph(gp, true);
}
else if (tokens[0] == "X") //second newest format based around signals
{ {
gp.ID = tokens[1].toUInt(nullptr, 16); gp.ID = tokens[1].toUInt(nullptr, 16);
gp.mask = tokens[2].toULongLong(nullptr, 16); gp.mask = tokens[2].toULongLong(nullptr, 16);
@@ -1271,7 +1323,7 @@ void GraphingWindow::createGraph(GraphParams &params, bool createGraphParam)
for (int i = 0; i < modelFrames->count(); i++) for (int i = 0; i < modelFrames->count(); i++)
{ {
CANFrame thisFrame = modelFrames->at(i); CANFrame thisFrame = modelFrames->at(i);
if (thisFrame.frameId() == params.ID && thisFrame.frameType() == QCanBusFrame::DataFrame) frameCache.append(thisFrame); if (thisFrame.frameId() == params.ID && thisFrame.frameType() == QCanBusFrame::DataFrame && ( ( params.bus == -1) || (params.bus == thisFrame.bus) ) ) frameCache.append(thisFrame);
} }
//to fix weirdness where a graph that has no data won't be able to be edited, selected, or deleted properly //to fix weirdness where a graph that has no data won't be able to be edited, selected, or deleted properly
@@ -1508,6 +1560,7 @@ GraphParams::GraphParams()
scale = 1; scale = 1;
stride = 1; stride = 1;
strideSoFar = 1; strideSoFar = 1;
bus = -1;
lineColor = QColor(0,0,0); lineColor = QColor(0,0,0);
fillColor = QColor(255,255,255,0); fillColor = QColor(255,255,255,0);
lineWidth = 1; lineWidth = 1;
re/graphingwindow.h
+2
View File
@@ -25,6 +25,7 @@ public:
double scale; double scale;
int stride; int stride;
int strideSoFar; int strideSoFar;
int bus;
QColor lineColor; QColor lineColor;
QColor fillColor; QColor fillColor;
int lineWidth; int lineWidth;
@@ -33,6 +34,7 @@ public:
QCPGraph *ref; QCPGraph *ref;
QString graphName; QString graphName;
DBC_SIGNAL *associatedSignal; DBC_SIGNAL *associatedSignal;
//the below stuff is used for internal purposes only - code should be refactored so these can be private //the below stuff is used for internal purposes only - code should be refactored so these can be private
QVector<double> x, y; QVector<double> x, y;
double xbias; double xbias;
re/newgraphdialog.cpp
+2
View File
@@ -199,6 +199,7 @@ void NewGraphDialog::setParams(GraphParams &params)
ui->txtDataLen->setText(QString::number(dataLen)); ui->txtDataLen->setText(QString::number(dataLen));
ui->txtID->setText(Utility::formatCANID(params.ID)); ui->txtID->setText(Utility::formatCANID(params.ID));
ui->txtName->setText(params.graphName); ui->txtName->setText(params.graphName);
ui->editBus->setText(QString::number(params.bus));
QPalette p = ui->colorSwatch->palette(); QPalette p = ui->colorSwatch->palette();
p.setColor(QPalette::Button, params.lineColor); p.setColor(QPalette::Button, params.lineColor);
ui->colorSwatch->setPalette(p); ui->colorSwatch->setPalette(p);
@@ -234,6 +235,7 @@ void NewGraphDialog::getParams(GraphParams &params)
params.mask = Utility::ParseStringToNum(ui->txtMask->text()); params.mask = Utility::ParseStringToNum(ui->txtMask->text());
params.scale = ui->txtScale->text().toFloat(); params.scale = ui->txtScale->text().toFloat();
params.stride = Utility::ParseStringToNum(ui->txtStride->text()); params.stride = Utility::ParseStringToNum(ui->txtStride->text());
params.bus = Utility::ParseStringToNum(ui->editBus->text());
params.startBit = startBit; params.startBit = startBit;
params.numBits = dataLen; params.numBits = dataLen;
ui/newgraphdialog.ui
+26 -13
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>681</width> <width>681</width>
<height>806</height> <height>828</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -142,38 +142,38 @@
<item row="9" column="1"> <item row="9" column="1">
<widget class="QLineEdit" name="txtStride"/> <widget class="QLineEdit" name="txtStride"/>
</item> </item>
<item row="11" column="0"> <item row="12" column="0">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="text"> <property name="text">
<string>Only Points</string> <string>Only Points</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="12" column="1">
<widget class="QCheckBox" name="cbOnlyPoints"> <widget class="QCheckBox" name="cbOnlyPoints">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="13" column="0">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
<property name="text"> <property name="text">
<string>Point Style</string> <string>Point Style</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="13" column="1">
<widget class="QComboBox" name="coPointStyle"/> <widget class="QComboBox" name="coPointStyle"/>
</item> </item>
<item row="13" column="0"> <item row="14" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>Line Thickness</string> <string>Line Thickness</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="14" column="1">
<widget class="QSpinBox" name="spinLineWidth"> <widget class="QSpinBox" name="spinLineWidth">
<property name="maximum"> <property name="maximum">
<number>15</number> <number>15</number>
@@ -183,14 +183,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="15" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Line Color</string> <string>Line Color</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="15" column="1">
<widget class="QPushButton" name="colorSwatch"> <widget class="QPushButton" name="colorSwatch">
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>
@@ -203,14 +203,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="16" column="0">
<widget class="QLabel" name="label55"> <widget class="QLabel" name="label55">
<property name="text"> <property name="text">
<string>Fill Color</string> <string>Fill Color</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="16" column="1">
<widget class="QPushButton" name="fillSwatch"> <widget class="QPushButton" name="fillSwatch">
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>
@@ -223,7 +223,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1"> <item row="17" column="1">
<widget class="QPushButton" name="btnAddGraph"> <widget class="QPushButton" name="btnAddGraph">
<property name="text"> <property name="text">
<string>Add this graph</string> <string>Add this graph</string>
@@ -243,6 +243,20 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="11" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Associated Bus</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QLineEdit" name="editBus">
<property name="text">
<string>-1</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@@ -313,7 +327,6 @@
<property name="font"> <property name="font">
<font> <font>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>