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

Added support for seconds mode to graphing view.

Browse Source
This commit is contained in:
Collin Kidder
2015-07-05 13:36:06 -04:00
parent 04e7a570e2
commit 5a302cc602
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphingwindow.cpp
+32 -4
View File
@@ -27,7 +27,9 @@ GraphingWindow::GraphingWindow(const QVector<CANFrame> *frames, QWidget *parent)
ui->graphingView->xAxis->setLabel("Time Axis");
ui->graphingView->yAxis->setLabel("Value Axis");
ui->graphingView->xAxis->setNumberFormat("f");
ui->graphingView->xAxis->setNumberPrecision(0);
if (secondsMode) ui->graphingView->xAxis->setNumberPrecision(6);
else ui->graphingView->xAxis->setNumberPrecision(0);
ui->graphingView->legend->setVisible(true);
QFont legendFont = font();
legendFont.setPointSize(10);
@@ -89,6 +91,7 @@ void GraphingWindow::readSettings()
resize(settings.value("Graphing/WindowSize", QSize(800, 600)).toSize());
move(settings.value("Graphing/WindowPos", QPoint(50, 50)).toPoint());
}
secondsMode = settings.value("Main/TimeSeconds", false).toBool();
}
void GraphingWindow::writeSettings()
@@ -401,7 +404,14 @@ void GraphingWindow::createGraph(GraphParams &params, bool createGraphParam)
{
tempVal = tempVal - 256;
}
x[j] = frameCache[j].timestamp;
if (secondsMode)
{
x[j] = (double)(frameCache[j].timestamp) / 1000000.0;
}
else
{
x[j] = frameCache[j].timestamp;
}
y[j] = (tempVal + params.bias) * params.scale;
if (y[j] < yminval) yminval = y[j];
if (y[j] > ymaxval) ymaxval = y[j];
@@ -434,7 +444,16 @@ void GraphingWindow::createGraph(GraphParams &params, bool createGraphParam)
}
tempValue = (float)tempValInt;
x[j] = frameCache[j].timestamp;
if (secondsMode)
{
x[j] = (double)(frameCache[j].timestamp) / 1000000.0;
}
else
{
x[j] = frameCache[j].timestamp;
}
y[j] = (tempValue + params.bias) * params.scale;
if (y[j] < yminval) yminval = y[j];
if (y[j] > ymaxval) ymaxval = y[j];
@@ -465,7 +484,16 @@ void GraphingWindow::createGraph(GraphParams &params, bool createGraphParam)
}
tempValue = (float)tempValInt;
x[j] = frameCache[j].timestamp;
if (secondsMode)
{
x[j] = (double)(frameCache[j].timestamp) / 1000000.0;
}
else
{
x[j] = frameCache[j].timestamp;
}
y[j] = (tempValue + params.bias) * params.scale;
if (y[j] < yminval) yminval = y[j];
if (y[j] > ymaxval) ymaxval = y[j];
graphingwindow.h
+2 -1
View File
@@ -56,7 +56,8 @@ private:
const QVector<CANFrame> *modelFrames;
QList<GraphParams> graphParams;
QPen selectedPen;
bool needScaleSetup; //do we need to set x,y graphing extents?s
bool needScaleSetup; //do we need to set x,y graphing extents?
bool secondsMode;
void showParamsDialog(int idx);
void closeEvent(QCloseEvent *event);