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

Merge pull request #297 from bigoulours/feature/continuous_logging

Browse Source 
Feature/continuous logging
This commit is contained in:
Collin Kidder
2021-02-23 19:26:45 -05:00
committed by GitHub
parent 2c53967493 697e486f05
commit 851d6d9d76
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+14 -3
View File
@@ -143,6 +143,9 @@ MainWindow::MainWindow(QWidget *parent) :
connect(CANConManager::getInstance(), &CANConManager::framesReceived, model, &CANFrameModel::addFrames);
//new implementation for continuous logging:
connect(CANConManager::getInstance(), &CANConManager::framesReceived, this, &MainWindow::logReceivedFrame);
lbStatusConnected.setText(tr("Connected to 0 buses"));
lbHelp.setText(tr("Press F1 on any screen for help"));
lbHelp.setAlignment(Qt::AlignCenter);
@@ -579,6 +582,14 @@ void MainWindow::filterClearAll()
model->setAllFilters(false);
}
void MainWindow::logReceivedFrame(CANConnection* conn, QVector<CANFrame> frames)
{
if (continuousLogging)
{
FrameFileIO::writeContinuousNative(&frames, 0);
}
}
void MainWindow::tickGUIUpdate()
{
rxFrames = model->sendBulkRefresh();
@@ -605,8 +616,8 @@ void MainWindow::tickGUIUpdate()
if (continuousLogging)
{
const QVector<CANFrame> *modelFrames = model->getListReference();
FrameFileIO::writeContinuousNative(modelFrames, modelFrames->count() - rxFrames);
// const QVector<CANFrame> *modelFrames = model->getListReference();
// FrameFileIO::writeContinuousNative(modelFrames, modelFrames->count() - rxFrames);
continuousLogFlushCounter++;
if ((continuousLogFlushCounter % 3) == 0)
@@ -617,7 +628,7 @@ void MainWindow::tickGUIUpdate()
}
else
{
ui->lblContMsg->setText("CONTINUOUS LOGGING");
ui->lblContMsg->setText("LOGGING");
}
}
if (continuousLogFlushCounter > 8)
mainwindow.h
+1 -1
View File
@@ -94,7 +94,7 @@ private slots:
void gridDoubleClicked(QModelIndex);
void interpretToggled(bool);
void overwriteToggled(bool);
//void logReceivedFrame(CANConnection*, QVector<CANFrame>);
void logReceivedFrame(CANConnection*, QVector<CANFrame>);
void tickGUIUpdate();
void toggleCapture();
void normalizeTiming();