tempo-plotter Changeset - f90eae47c75b · protofusion repositories

Changeset - f90eae47c75b

Parent rev.

Child rev.

[Not reviewed]

stream

0 8 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-06-23 10:12:14
hy@ozderya.net

snapshots now use read only buffer

8 files changed with 62 insertions and 56 deletions:

CMakeLists.txt

src/plotmanager.cpp

src/plotmanager.h

src/readonlybuffer.cpp

src/readonlybuffer.h

src/snapshot.cpp

src/snapshot.h

src/snapshotmanager.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -123,12 +123,13 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   src/stream.cpp
   src/streamchannel.cpp
   src/channelinfomodel.cpp
   src/ringbuffer.cpp
   src/ringbuffer.cpp
   src/indexbuffer.cpp
   src/readonlybuffer.cpp
   src/framebufferseries.cpp
   src/numberformatbox.cpp
   src/endiannessbox.cpp
   src/abstractreader.cpp
   src/binarystreamreader.cpp
   src/binarystreamreadersettings.cpp

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -44,13 +44,12 @@ PlotManager::PlotManager(QWidget* plotAr @@
+            {
                 onChannelInfoChanged(infoModel->index(0, 0), // start
                                      infoModel->index(infoModel->rowCount()-1, 0), // end
                                      {}); // roles ignored
             });
     connect(stream, &Stream::numChannelsChanged, this, &PlotManager::onNumChannelsChanged);
     connect(stream, &Stream::dataAdded, this, &PlotManager::replot);
     // add initial curves if any?
     for (unsigned int i = 0; i < stream->numChannels(); i++)
+    {
@@ @@ -68,13 +67,13 @@ PlotManager::PlotManager(QWidget* plotAr @@
     setNumOfSamples(snapshot->numSamples());
     setPlotWidth(snapshot->numSamples());
     infoModel = snapshot->infoModel();
     for (unsigned ci = 0; ci < snapshot->numChannels(); ci++)
+    {
-        addCurve(snapshot->channelName(ci), snapshot->data[ci]);
+        addCurve(snapshot->channelName(ci), snapshot->yData[ci]);
+    }
     connect(infoModel, &QAbstractItemModel::dataChanged,
             this, &PlotManager::onChannelInfoChanged);
+}
@@ @@ -335,19 +334,12 @@ void PlotManager::addCurve(QString title @@
     auto series = new FrameBufferSeries(buffer);
     series->setXAxis(_xAxisAsIndex, _xMin, _xMax);
     curve->setSamples(series);
     _addCurve(curve);
+}
 void PlotManager::addCurve(QString title, QVector<QPointF> data)
+{
     auto curve = new QwtPlotCurve(title);
     curve->setSamples(data);
     _addCurve(curve);
+}
 void PlotManager::_addCurve(QwtPlotCurve* curve)
+{
     // store and init the curve
     curves.append(curve);
     unsigned index = curves.size()-1;

src/plotmanager.h

➞

Show inline comments

@@ @@ -47,14 +47,12 @@ public: @@
                          Snapshot* snapshot,
                          QObject *parent = 0);
     ~PlotManager();
     /// Add a new curve with title and buffer. A color is
     /// automatically chosen for curve.
     void addCurve(QString title, const FrameBuffer* buffer);
     /// Alternative of `addCurve` for static curve data (snapshots).
     void addCurve(QString title, QVector<QPointF> data);
     /// Removes curves from the end
     void removeCurves(unsigned number);
     /// Returns current number of curves known by plot manager
     unsigned numOfCurves();
 public slots:

src/readonlybuffer.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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
@@ @@ -15,19 +15,20 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QtGlobal>
 #include <string.h>
 #include "readonlybuffer.h"
 ReadOnlyBuffer::ReadOnlyBuffer(const FrameBuffer* source) :
     ReadOnlyBuffer(source, 0, source->size())
+{
     // empty
+    // intentionally empty, see ↑
+}
 ReadOnlyBuffer::ReadOnlyBuffer(const FrameBuffer* source, unsigned start, unsigned n)
+{
     Q_ASSERT(source->size() > 0);
     Q_ASSERT(start + n <= source->size());
@@ @@ -44,28 +45,24 @@ ReadOnlyBuffer::ReadOnlyBuffer(const Fra @@
     if (start == 0 && n == source->size())
+    {
         _limits = source->limits();
+    }
     else
+    {
         // TODO: code duplication with RingBuffer::updateLimits, consider reuse
         _limits.start = data[0];
         _limits.end = data[0];
         for (unsigned i = 0; i < _size; i++)
+        {
             if (data[i] > _limits.end)
+            {
                 _limits.end = data[i];
+            }
             else if (data[i] < _limits.start)
+            {
                 _limits.start = data[i];
         updateLimits();
+            }
+        }
+    }
 ReadOnlyBuffer::ReadOnlyBuffer(const double* source, unsigned ssize)
+{
     Q_ASSERT(source != nullptr && ssize);
     _size = ssize;
     data = new double[_size];
     memcpy(data, source, sizeof(double) * ssize);
     updateLimits();
+}
 ReadOnlyBuffer::~ReadOnlyBuffer()
+{
     delete[] data;
+}
@@ @@ -81,6 +78,26 @@ double ReadOnlyBuffer::sample(unsigned i @@
+}
 Range ReadOnlyBuffer::limits() const
+{
     return _limits;
+}
 void ReadOnlyBuffer::updateLimits()
+{
     Q_ASSERT(_size);
     _limits.start = data[0];
     _limits.end = data[0];
     for (unsigned i = 0; i < _size; i++)
+    {
         if (data[i] > _limits.end)
+        {
             _limits.end = data[i];
+        }
         else if (data[i] < _limits.start)
+        {
             _limits.start = data[i];
+        }
+    }
+}

src/readonlybuffer.h

➞

Show inline comments

@@ @@ -38,19 +38,25 @@ public: @@
     /// @param n number of samples
     ///
     /// @important (start + n) should be smaller or equal than `source->size()`,
     /// otherwise it's an error.
     ReadOnlyBuffer(const FrameBuffer* source, unsigned start, unsigned n);
     /// Creates a buffer with data copied from an array
     ReadOnlyBuffer(const double* source, unsigned ssize);
     ~ReadOnlyBuffer();
     virtual unsigned size() const;
     virtual double sample(unsigned i) const;
     virtual Range limits() const;
 private:
     double* data;    ///< data storage
     unsigned _size;  ///< data size
     Range _limits;   ///< limits cache
     // TODO: duplicate with `RingBuffer`
     void updateLimits(); ///< Updates limits cache
 };
 #endif // READONLYBUFFER_H

src/snapshot.cpp

➞

Show inline comments

@@ @@ -107,18 +107,18 @@ void Snapshot::setName(QString name) @@
     _showAction.setText(_name);
     emit nameChanged(this);
+}
 unsigned Snapshot::numChannels() const
+{
-    return data.size();
+    return yData.size();
+}
 unsigned Snapshot::numSamples() const
+{
-    return data[0].size();
+    return yData[0]->size();
+}
 const ChannelInfoModel* Snapshot::infoModel() const
+{
     return &cInfoModel;
+}
@@ @@ -132,37 +132,33 @@ QString Snapshot::channelName(unsigned c @@
+{
     return cInfoModel.name(channel);
+}
 void Snapshot::save(QString fileName)
+{
     // TODO: remove code duplication (MainWindow::onExportCsv)
     QSaveFile file(fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
         QTextStream fileStream(&file);
         unsigned numOfChannels = data.size();
         unsigned numOfSamples = data[0].size();
         // print header
-        for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        for (unsigned int ci = 0; ci < numChannels(); ci++)
+        {
             fileStream << channelName(ci);
-            if (ci != numOfChannels-1) fileStream << ",";
+            if (ci != numChannels()-1) fileStream << ",";
+        }
         fileStream << '\n';
         // print rows
-        for (unsigned int i = 0; i < numOfSamples; i++)
+        for (unsigned int i = 0; i < numSamples(); i++)
+        {
-            for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            for (unsigned int ci = 0; ci < numChannels(); ci++)
+            {
                 fileStream << data[ci][i].y();
                 if (ci != numOfChannels-1) fileStream << ",";
                 fileStream << yData[ci]->sample(i);
                 if (ci != numChannels()-1) fileStream << ",";
+            }
             fileStream << '\n';
+        }
         if (!file.commit())
+        {

src/snapshot.h

➞

Show inline comments

@@ @@ -24,25 +24,27 @@ @@
 #include <QAction>
 #include <QVector>
 #include <QString>
 #include <QStringList>
 #include "channelinfomodel.h"
 #include "readonlybuffer.h"
 class SnapshotView;
 class MainWindow;
 class Snapshot : public QObject
+{
     Q_OBJECT
 public:
     Snapshot(MainWindow* parent, QString name, ChannelInfoModel infoModel, bool saved = false);
     ~Snapshot();
     QVector<QVector<QPointF>> data;
     // TODO: yData of snapshot shouldn't be public, preferable should be handled in constructor
     QVector<ReadOnlyBuffer*> yData;
     QAction* showAction();
     QAction* deleteAction();
     QString name();
     QString displayName(); ///< `name()` plus '*' if snapshot is not saved
     unsigned numChannels() const; ///< number of channels in this snapshot

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -65,24 +65,15 @@ SnapshotManager::~SnapshotManager() @@
 Snapshot* SnapshotManager::makeSnapshot() const
+{
     QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");
     auto snapshot = new Snapshot(_mainWindow, name, *(_stream->infoModel()));
     unsigned numChannels = _stream->numChannels();
     unsigned numSamples = _stream->numSamples();
     for (unsigned ci = 0; ci < numChannels; ci++)
     for (unsigned ci = 0; ci < _stream->numChannels(); ci++)
+    {
         snapshot->data.append(QVector<QPointF>(numSamples));
         auto x = _stream->channel(ci)->xData();
         auto y = _stream->channel(ci)->yData();
         for (unsigned i = 0; i < numSamples; i++)
+        {
             snapshot->data[ci][i] = QPointF(x->sample(i), y->sample(i));
+        }
         snapshot->yData.append(new ReadOnlyBuffer(_stream->channel(ci)->yData()));
+    }
     return snapshot;
+}
 void SnapshotManager::takeSnapshot()
@@ @@ -157,13 +148,13 @@ void SnapshotManager::loadSnapshotFromFi @@
     // read first row as headlines and determine number of channels
     auto headLine = QString(file.readLine());
     QStringList channelNames = headLine.split(',');
     unsigned numOfChannels = channelNames.size();
     // read data
-    QVector<QVector<QPointF>> data(numOfChannels);
+    QVector<QVector<double>> data(numOfChannels);
     unsigned lineNum = 1;
     while (file.canReadLine())
+    {
         // parse line
         auto line = QString(file.readLine());
         auto split = line.split(',');
@@ @@ -185,23 +176,26 @@ void SnapshotManager::loadSnapshotFromFi @@
                 qCritical() << "Parsing error at line " << lineNum
                             << ", column " << ci
                             << ": can't convert \"" << split[ci]
                             << "\" to double.";
                 return;
+            }
-            data[ci].append(QPointF(lineNum-1, y));
             data[ci].append(y);
+        }
         lineNum++;
+    }
     ChannelInfoModel channelInfo(channelNames);
     // create snapshot
     auto snapshot = new Snapshot(
         _mainWindow, QFileInfo(fileName).baseName(),
         ChannelInfoModel(channelNames), true);
     snapshot->data = data;
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         snapshot->yData.append(new ReadOnlyBuffer(data[ci].data(), data[ci].size()));
+    }
     addSnapshot(snapshot, false);
+}
 QMenu* SnapshotManager::menu()
+{

0 comments (0 inline, 0 general)