From 57426d273a4883860720d189888308c4a0669222 Mon Sep 17 00:00:00 2001 From: Bertrand Date: Tue, 23 Feb 2021 09:52:24 +0100 Subject: [PATCH] changing implementation of continuous logging uncommenting function declaration --- mainwindow.cpp | 17 ++++++++++++++--- mainwindow.h | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index eb47a56..7775e6e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -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 frames) +{ + if (continuousLogging) + { + FrameFileIO::writeContinuousNative(&frames, 0); + } +} + void MainWindow::tickGUIUpdate() { rxFrames = model->sendBulkRefresh(); @@ -605,8 +616,8 @@ void MainWindow::tickGUIUpdate() if (continuousLogging) { - const QVector *modelFrames = model->getListReference(); - FrameFileIO::writeContinuousNative(modelFrames, modelFrames->count() - rxFrames); +// const QVector *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) diff --git a/mainwindow.h b/mainwindow.h index ce4adf5..5505b51 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -94,7 +94,7 @@ private slots: void gridDoubleClicked(QModelIndex); void interpretToggled(bool); void overwriteToggled(bool); - //void logReceivedFrame(CANConnection*, QVector); + void logReceivedFrame(CANConnection*, QVector); void tickGUIUpdate(); void toggleCapture(); void normalizeTiming();