tempo-plotter Changeset - e0c6c43cbcf5 · protofusion repositories

Changeset - e0c6c43cbcf5

Parent rev.

Child rev.

[Not reviewed]

recording

0 18 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-14 08:21:16
hy@ozderya.net

data recording mostly integrated and working

18 files changed with 167 insertions and 41 deletions:

src/abstractreader.cpp

src/abstractreader.h

src/asciireader.cpp

src/asciireader.h

src/binarystreamreader.cpp

src/binarystreamreader.h

src/channelmanager.cpp

src/channelmanager.h

src/dataformatpanel.cpp

src/dataformatpanel.h

src/demoreader.cpp

src/demoreader.h

src/framedreader.cpp

src/framedreader.h

src/mainwindow.cpp

src/mainwindow.h

src/recordpanel.cpp

src/recordpanel.h

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

@@ @@ -16,17 +16,22 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "abstractreader.h"
 AbstractReader::AbstractReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
 #include <QtDebug>
 AbstractReader::AbstractReader(QIODevice* device, ChannelManager* channelMan,
                                DataRecorder* recorder, QObject* parent) :
     QObject(parent)
+{
     _device = device;
     _channelMan = channelMan;
     _recorder = recorder;
     recording = false;
     // initialize sps counter
     sampleCount = 0;
     samplesPerSecond = 0;
     QObject::connect(&spsTimer, &QTimer::timeout,
                      this, &AbstractReader::spsTimerTimeout);
@@ @@ -45,8 +50,13 @@ void AbstractReader::spsTimerTimeout() @@
     sampleCount = 0;
+}
 void AbstractReader::addData(double* samples, unsigned length)
+{
     _channelMan->addData(samples, length);
     if (recording)
+    {
         _recorder->addData(samples, length, numOfChannels());
         qDebug() << "adding data";
+    }
     sampleCount += length;
+}

src/abstractreader.h

➞

Show inline comments

@@ @@ -23,21 +23,25 @@ @@
 #include <QObject>
 #include <QIODevice>
 #include <QWidget>
 #include <QTimer>
 #include "channelmanager.h"
 #include "datarecorder.h"
 /**
  * All reader classes must inherit this class.
  */
 class AbstractReader : public QObject
+{
     Q_OBJECT
 public:
     explicit AbstractReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     explicit AbstractReader(QIODevice* device, ChannelManager* channelMan,
                             DataRecorder* recorder, QObject* parent = 0);
     bool recording;                 /// is recording started
     /**
      * Returns a widget to be shown in data format panel when reader
      * is selected.
      */
     virtual QWidget* settingsWidget() = 0;
@@ @@ -51,12 +55,22 @@ public: @@
     virtual unsigned numOfChannels() = 0;
     /// Reader should only read when enabled. Default state should be
     /// 'disabled'.
     virtual void enable(bool enabled = true) = 0;
     /**
      * @brief Starts sending data to recorder.
+     *
      * @note recorder must have been started!
      */
     void startRecording();
     /// Stops recording.
     void stopRecording();
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
 public slots:
     /**
@@ @@ -72,15 +86,18 @@ protected: @@
     /// Should be called with read data
     void addData(double* samples, unsigned length);
 private:
     const int SPS_UPDATE_TIMEOUT = 1;  // second
-    ChannelManager* _channelMan;
     unsigned sampleCount;
     unsigned samplesPerSecond;
     ChannelManager* _channelMan;
     DataRecorder* _recorder;
     QTimer spsTimer;
 private slots:
     void spsTimerTimeout();
 };

src/asciireader.cpp

➞

Show inline comments

@@ @@ -21,14 +21,15 @@ @@
 #include "asciireader.h"
 /// If set to this value number of channels is determined from input
 #define NUMOFCHANNELS_AUTO   (0)
 AsciiReader::AsciiReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
 AsciiReader::AsciiReader(QIODevice* device, ChannelManager* channelMan,
                          DataRecorder* recorder, QObject* parent) :
     AbstractReader(device, channelMan, recorder, parent)
+{
     paused = false;
     discardFirstLine = true;
     _numOfChannels = _settingsWidget.numOfChannels();
     autoNumOfChannels = (_numOfChannels == NUMOFCHANNELS_AUTO);

src/asciireader.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -27,13 +27,14 @@ @@
 class AsciiReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit AsciiReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     explicit AsciiReader(QIODevice* device, ChannelManager* channelMan,
                          DataRecorder* recorder, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numOfChannels();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -20,14 +20,15 @@ @@
 #include <QtEndian>
 #include <QtDebug>
 #include "binarystreamreader.h"
 #include "floatswap.h"
 BinaryStreamReader::BinaryStreamReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
 BinaryStreamReader::BinaryStreamReader(QIODevice* device, ChannelManager* channelMan,
                                        DataRecorder* recorder, QObject* parent) :
     AbstractReader(device, channelMan, recorder, parent)
+{
     paused = false;
     skipByteRequested = false;
     skipSampleRequested = false;
     _numOfChannels = _settingsWidget.numOfChannels();

src/binarystreamreader.h

➞

Show inline comments

@@ @@ -31,13 +31,14 @@ @@
  * that should be manually triggered by user.
  */
 class BinaryStreamReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit BinaryStreamReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     explicit BinaryStreamReader(QIODevice* device, ChannelManager* channelMan,
                                 DataRecorder* recorder, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numOfChannels();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.

src/channelmanager.cpp

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ @@
 ChannelManager::ChannelManager(unsigned numberOfChannels, unsigned numberOfSamples, QObject *parent) :
     QObject(parent),
     _infoModel(numberOfChannels)
+{
     _numOfChannels = numberOfChannels;
     _numOfSamples = numberOfSamples;
     _paused = false;
     for (unsigned int i = 0; i < numberOfChannels; i++)
+    {
         channelBuffers.append(new FrameBuffer(numberOfSamples));
+    }
@@ @@ -94,12 +95,17 @@ void ChannelManager::setNumOfSamples(uns @@
         channelBuffers[ci]->resize(_numOfSamples);
+    }
     emit numOfSamplesChanged(number);
+}
 void ChannelManager::pause(bool paused)
+{
     _paused = paused;
+}
 FrameBuffer* ChannelManager::channelBuffer(unsigned channel)
+{
     return channelBuffers[channel];
+}
 ChannelInfoModel* ChannelManager::infoModel()
@@ @@ -162,12 +168,14 @@ void ChannelManager::onChannelInfoChange @@
+}
 void ChannelManager::addData(double* data, unsigned size)
+{
     Q_ASSERT(size % _numOfChannels == 0);
     if (_paused) return;
     int n = size / _numOfChannels;
     for (unsigned ci = 0; ci < _numOfChannels; ci++)
+    {
         channelBuffers[ci]->addSamples(&data[ci*n], n);
+    }

src/channelmanager.h

➞

Show inline comments

@@ @@ -69,15 +69,19 @@ public slots: @@
+     *
      * @param data samples for all channels
      * @param size size of `data`, must be multiple of `numOfChannels`
      */
     void addData(double* data, unsigned size);
     /// When paused `addData` does nothing.
     void pause(bool paused);
 private:
     unsigned _numOfChannels;
     unsigned _numOfSamples;
     bool _paused;
     QList<FrameBuffer*> channelBuffers;
     // QStringListModel _channelNames;
     ChannelInfoModel _infoModel;
     void addChannelName(QString name); ///< appends a new channel name at the end of list

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -28,25 +28,27 @@ @@
 #include "utils.h"
 #include "setting_defines.h"
 #include "floatswap.h"
 DataFormatPanel::DataFormatPanel(QSerialPort* port,
                                  ChannelManager* channelMan,
                                  DataRecorder* recorder,
                                  QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel),
     bsReader(port, channelMan, this),
     asciiReader(port, channelMan, this),
     framedReader(port, channelMan, this),
     demoReader(port, channelMan, this)
     bsReader(port, channelMan, recorder, this),
     asciiReader(port, channelMan, recorder, this),
     framedReader(port, channelMan, recorder, this),
     demoReader(port, channelMan, recorder, this)
+{
     ui->setupUi(this);
     serialPort = port;
     _channelMan = channelMan;
     paused = false;
     demoEnabled = false;
     // initalize default reader
     currentReader = &bsReader;
     bsReader.enable();
     ui->rbBinary->setChecked(true);
     ui->horizontalLayout->addWidget(bsReader.settingsWidget(), 1);
@@ @@ -95,20 +97,34 @@ void DataFormatPanel::pause(bool enabled @@
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoReader.enable();
         demoReader.recording = currentReader->recording;
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
+    }
     else
+    {
         demoReader.enable(false);
         disconnect(&demoReader, 0, this, 0);
+    }
     demoEnabled = enabled;
+}
 void DataFormatPanel::startRecording()
+{
     currentReader->recording = true;
     if (demoEnabled) demoReader.recording = true;
+}
 void DataFormatPanel::stopRecording()
+{
     currentReader->recording = false;
     if (demoEnabled) demoReader.recording = false;
+}
 void DataFormatPanel::selectReader(AbstractReader* reader)
+{
     currentReader->enable(false);
     reader->enable();
@@ @@ -129,14 +145,14 @@ void DataFormatPanel::selectReader(Abstr @@
     // notify if number of channels is different
     if (currentReader->numOfChannels() != reader->numOfChannels())
+    {
         emit numOfChannelsChanged(reader->numOfChannels());
+    }
     // pause
     reader->pause(paused);
     reader->recording = currentReader->recording;
     currentReader = reader;
+}
 void DataFormatPanel::saveSettings(QSettings* settings)
+{

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -31,25 +31,27 @@ @@
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "demoreader.h"
 #include "framedreader.h"
 #include "datarecorder.h"
 namespace Ui {
 class DataFormatPanel;
+}
 class DataFormatPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit DataFormatPanel(QSerialPort* port,
                              ChannelManager* channelMan,
                              QWidget *parent = 0);
                              DataRecorder* recorder,
                              QWidget* parent = 0);
     ~DataFormatPanel();
     /// Returns currently selected number of channels
     unsigned numOfChannels();
     /// Stores data format panel settings into a `QSettings`
     void saveSettings(QSettings* settings);
@@ @@ -57,12 +59,22 @@ public: @@
     void loadSettings(QSettings* settings);
 public slots:
     void pause(bool);
     void enableDemo(bool); // demo shouldn't be enabled when port is open
     /**
      * @brief Starts sending data to recorder.
+     *
      * @note recorder must have been started!
      */
     void startRecording();
     /// Stops recording.
     void stopRecording();
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
 private:
     Ui::DataFormatPanel *ui;
@@ @@ -77,10 +89,11 @@ private: @@
     AbstractReader* currentReader;
     /// Disable current reader and enable a another one
     void selectReader(AbstractReader* reader);
     bool paused;
     bool demoEnabled;
     DemoReader demoReader;
 };
 #endif // DATAFORMATPANEL_H

src/demoreader.cpp

➞

Show inline comments

@@ @@ -22,14 +22,15 @@ @@
 #include "demoreader.h"
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 DemoReader::DemoReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
 DemoReader::DemoReader(QIODevice* device, ChannelManager* channelMan,
                        DataRecorder* recorder, QObject* parent) :
     AbstractReader(device, channelMan, recorder, parent)
+{
     paused = false;
     _numOfChannels = 1;
     count = 0;
     timer.setInterval(100);
     QObject::connect(&timer, &QTimer::timeout,

src/demoreader.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -35,13 +35,14 @@ @@
  */
 class DemoReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit DemoReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     explicit DemoReader(QIODevice* device, ChannelManager* channelMan,
                         DataRecorder* recorder, QObject* parent = 0);
     /// Demo reader is an exception so this function returns NULL
     QWidget* settingsWidget();
     unsigned numOfChannels();

src/framedreader.cpp

➞

Show inline comments

@@ @@ -20,14 +20,15 @@ @@
 #include <QtDebug>
 #include <QtEndian>
 #include "floatswap.h"
 #include "framedreader.h"
 FramedReader::FramedReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
 FramedReader::FramedReader(QIODevice* device, ChannelManager* channelMan,
                            DataRecorder* recorder, QObject* parent) :
     AbstractReader(device, channelMan, recorder, parent)
+{
     paused = false;
     // initial settings
     settingsInvalid = 0;
     _numOfChannels = _settingsWidget.numOfChannels();

src/framedreader.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -30,13 +30,14 @@ @@
  */
 class FramedReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit FramedReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     explicit FramedReader(QIODevice* device, ChannelManager* channelMan,
                           DataRecorder* recorder, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numOfChannels();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -59,14 +59,14 @@ MainWindow::MainWindow(QWidget *parent) @@
     ui(new Ui::MainWindow),
     aboutDialog(this),
     portControl(&serialPort),
     channelMan(1, 1, this),
     snapshotMan(this, &channelMan),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort, &channelMan),
     recordPanel(this)
     dataFormatPanel(&serialPort, &channelMan, &recorder),
     recordPanel(&recorder)
+{
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea, channelMan.infoModel());
     ui->tabWidget->insertTab(0, &portControl, "Port");
@@ @@ -149,19 +149,46 @@ MainWindow::MainWindow(QWidget *parent) @@
                      plotMan, &PlotManager::flashSnapshotOverlay);
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // TODO: `replot` must be triggered from ChannelManager
     // init data format and reader
     QObject::connect(&channelMan, &ChannelManager::dataAdded,
                      plotMan, &PlotManager::replot);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      &dataFormatPanel, &DataFormatPanel::pause);
                      &channelMan, &ChannelManager::pause);
     QObject::connect(&recordPanel, &RecordPanel::recordStarted,
                      &dataFormatPanel, &DataFormatPanel::startRecording);
     QObject::connect(&recordPanel, &RecordPanel::recordStopped,
                      &dataFormatPanel, &DataFormatPanel::stopRecording);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      [this](bool enabled)
+                     {
                          if (enabled && !recordPanel.recordPaused())
+                         {
                              dataFormatPanel.pause(true);
+                         }
                          else
+                         {
                              dataFormatPanel.pause(false);
+                         }
                      });
     QObject::connect(&recordPanel, &RecordPanel::recordPausedChanged,
                      [this](bool enabled)
+                     {
                          if (ui->actionPause->isChecked() && enabled)
+                         {
                              dataFormatPanel.pause(false);
+                         }
                      });
     // init data arrays and plot
     numOfSamples = plotControlPanel.numOfSamples();
     unsigned numOfChannels = dataFormatPanel.numOfChannels();
     channelMan.setNumOfSamples(numOfSamples);

src/mainwindow.h

➞

Show inline comments

@@ @@ -41,12 +41,13 @@ @@
 #include "recordpanel.h"
 #include "ui_about_dialog.h"
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "snapshotmanager.h"
 #include "plotmanager.h"
 #include "datarecorder.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
@@ @@ -72,18 +73,19 @@ private: @@
     unsigned int numOfSamples;
     QList<QwtPlotCurve*> curves;
     ChannelManager channelMan;
     PlotManager* plotMan;
     SnapshotManager snapshotMan;
     DataRecorder recorder;       // operated by `recordPanel`
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     RecordPanel recordPanel;
     PlotControlPanel plotControlPanel;
     RecordPanel recordPanel;
     bool isDemoRunning();
     /// Stores settings for all modules
     void saveAllSettings(QSettings* settings);
     /// Load settings for all modules
     void loadAllSettings(QSettings* settings);

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -26,20 +26,20 @@ @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QRegularExpression>
 #include <QtDebug>
 RecordPanel::RecordPanel(QWidget *parent) :
+RecordPanel::RecordPanel(DataRecorder* recorder, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::RecordPanel),
     recordToolBar(tr("Record Toolbar")),
     recordAction(QIcon::fromTheme("media-record"), tr("Record"), this),
     recorder(this)
     recordAction(QIcon::fromTheme("media-record"), tr("Record"), this)
+{
     overwriteSelected = false;
     _recorder = recorder;
     ui->setupUi(this);
     recordToolBar.setObjectName("tbRecord");
     recordAction.setCheckable(true);
@@ @@ -47,24 +47,37 @@ RecordPanel::RecordPanel(QWidget *parent @@
     ui->pbRecord->setDefaultAction(&recordAction);
     connect(ui->pbBrowse, &QPushButton::clicked,
             this, &RecordPanel::selectFile);
     connect(&recordAction, &QAction::triggered,
             this, &RecordPanel::onRecord);
     connect(ui->cbRecordPaused, SIGNAL(toggled(bool)),
             this, SIGNAL(recordPausedChanged(bool)));
+}
 RecordPanel::~RecordPanel()
+{
     delete ui;
+}
 QToolBar* RecordPanel::toolbar()
+{
     return &recordToolBar;
+}
 bool RecordPanel::isRecording()
+{
     return recordAction.isChecked();
+}
 bool RecordPanel::recordPaused()
+{
     return ui->cbRecordPaused->isChecked();
+}
 bool RecordPanel::selectFile()
+{
     QString fileName = QFileDialog::getSaveFileName(
         parentWidget(), tr("Select recording file"));
     if (fileName.isEmpty())
@@ @@ -198,21 +211,21 @@ bool RecordPanel::confirmOverwrite(QStri @@
 void RecordPanel::startRecording(void)
+{
     qDebug() << "start recording";
     // TEST CODE
     QStringList cn;
     cn << "chan0" << "chan1" << "chan2";
+    // cn << "chan0" << "chan1" << "chan2";
-    recorder.startRecording(selectedFile, cn);
+    _recorder->startRecording(selectedFile, cn);
     // add test data
     double data[3] = {15., 15., 15.};
     recorder.addData(data, 3, 3);
     // double data[3] = {15., 15., 15.};
     // _recorder.addData(data, 3, 3);
     emit recordStarted();
+}
 void RecordPanel::stopRecording(void)
+{
     // TODO
     qDebug() << "stop recording";
     recorder.stopRecording();
     emit recordStopped();
     _recorder->stopRecording();
+}

src/recordpanel.h

➞

Show inline comments

@@ @@ -33,24 +33,32 @@ class RecordPanel; @@
 class RecordPanel : public QWidget
+{
     Q_OBJECT
 public:
-    explicit RecordPanel(QWidget *parent = 0);
+    explicit RecordPanel(DataRecorder* recorder, QWidget* parent = 0);
     ~RecordPanel();
     QToolBar* toolbar();
     bool isRecording();
     bool recordPaused();
 signals:
     void recordStarted();
     void recordStopped();
     void recordPausedChanged(bool enabled);
 private:
     Ui::RecordPanel *ui;
     QToolBar recordToolBar;
     QAction recordAction;
     QString selectedFile;
     bool overwriteSelected;
-    DataRecorder recorder;
+    DataRecorder* _recorder;
     /**
      * @brief Increments the file name.
+     *
      * If file name doesn't have a number at the end of it, a number is appended
      * with underscore starting from 1.

0 comments (0 inline, 0 general)