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

Fix graphing of realtime data (previously an error caused only last

Browse Source 
graph to update).
This commit is contained in:
Collin Kidder
2017-08-30 21:30:00 -04:00
parent cbc6115ec4
commit 290af20e62
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/graphingwindow.cpp
+17 -9
View File
@@ -131,6 +131,9 @@ void GraphingWindow::updatedFrames(int numFrames)
{
CANFrame thisFrame;
QVector<double> x, y;
bool appendedToGraph = false;
bool needReplot = false;
if (numFrames == -1) //all frames deleted. Kill the display
{
//removeAllGraphs();
@@ -158,26 +161,31 @@ void GraphingWindow::updatedFrames(int numFrames)
}
else //just got some new frames. See if they are relevant.
{
bool appendedToGraph = false;
if (numFrames > modelFrames->count()) return;
for (int i = modelFrames->count() - numFrames; i < modelFrames->count(); i++)
for (int j = 0; j < graphParams.count(); j++)
{
thisFrame = modelFrames->at(i);
for (int j = 0; j < graphParams.count(); j++)
appendedToGraph = false;
x.clear();
y.clear();
for (int i = modelFrames->count() - numFrames; i < modelFrames->count(); i++)
{
thisFrame = modelFrames->at(i);
if (graphParams[j].ID == thisFrame.ID)
{
appendToGraph(graphParams[j], thisFrame, x, y);
appendedToGraph = true;
}
}
}
if (appendedToGraph) {
for (int j = 0; j < graphParams.count(); j++)
if (appendedToGraph)
{
//graphParams[j].ref->setData(graphParams[j].x, graphParams[j].y);
graphParams[j].ref->addData(x, y, true);
graphParams[j].ref->addData(x, y);
needReplot = true;
}
}
if (needReplot)
{
if (followGraphEnd)
{
//find the current X span and maintain that span but move the end of it over to match the new end