tempo-plotter Changeset - 54d6bf2bed9e · protofusion repositories

Changeset - 54d6bf2bed9e

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 5 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-03-24 17:49:30
hy@ozderya.net

removed QPointF returning sample() method from FrameBuffer class

5 files changed with 7 insertions and 14 deletions:

src/framebuffer.cpp

src/framebuffer.h

src/framebufferseries.cpp

src/mainwindow.cpp

src/snapshotmanager.cpp

0 comments (0 inline, 0 general)

src/framebuffer.cpp

➞

Show inline comments

 /*
   Copyright © 2015 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
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "framebuffer.h"
 FrameBuffer::FrameBuffer(size_t size)
+{
     _size = size;
     data = new double[_size]();
     headIndex = 0;
     _boundingRect.setCoords(0, 0, size, 0);
+}
 FrameBuffer::~FrameBuffer()
+{
     delete data;
+}
 void FrameBuffer::resize(size_t size)
+{
     int offset = size - _size;
     if (offset == 0) return;
     double* newData = new double[size];
     // move data to new array
     int fill_start = offset > 0 ? offset : 0;
     for (int i = fill_start; i < int(size); i++)
+    {
-        newData[i] = _sample(i - offset);
+        newData[i] = sample(i - offset);
+    }
     // fill the beginning of the new data
     if (fill_start > 0)
+    {
         for (int i = 0; i < fill_start; i++)
+        {
             newData[i] = 0;
+        }
+    }
     // data is ready, clean and re-point
     delete data;
     data = newData;
     headIndex = 0;
     _size = size;
     // update the bounding rectangle
     _boundingRect.setRight(_size);
+}
 void FrameBuffer::addSamples(double* samples, size_t size)
+{
     unsigned shift = size;
     if (shift < _size)
+    {
         unsigned x = _size - headIndex; // distance of `head` to end
         if (shift <= x) // there is enough room at the end of array
+        {
             for (size_t i = 0; i < shift; i++)
+            {
                 data[i+headIndex] = samples[i];
+            }
             if (shift == x) // we used all the room at the end
+            {
                 headIndex = 0;
+            }
             else
+            {
                 headIndex += shift;
+            }
+        }
         else // there isn't enough room
+        {
             for (size_t i = 0; i < x; i++) // fill the end part
+            {
                 data[i+headIndex] = samples[i];
+            }
             for (size_t i = 0; i < (shift-x); i++) // continue from the beginning
+            {
                 data[i] = samples[i+x];
+            }
             headIndex = shift-x;
+        }
+    }
     else // number of new samples equal or bigger than current size
+    {
         int x = shift - _size;
         for (size_t i = 0; i < _size; i++)
+        {
             data[i] = samples[i+x];
+        }
         headIndex = 0;
+    }
     // update bounding rectangle
     double minValue = 0;
     double maxValue = 0;
     for (size_t i = 0; i < _size; i++)
+    {
         if (data[i] > maxValue)
+        {
             maxValue = data[i];
+        }
         else if (data[i] < minValue)
+        {
             minValue = data[i];
+        }
+    }
     _boundingRect.setTop(minValue);
     _boundingRect.setBottom(maxValue);
+}
 void FrameBuffer::clear()
+{
     for (size_t i=0; i < _size; i++) data[i] = 0.;
+}
 size_t FrameBuffer::size() const
+{
     return _size;
+}
 QPointF FrameBuffer::sample(size_t i) const
+{
     return QPointF(i, _sample(i));
+}
 QRectF FrameBuffer::boundingRect() const
+{
     return _boundingRect;
+}
-double FrameBuffer::_sample(size_t i) const
+double FrameBuffer::sample(size_t i) const
+{
     size_t index = headIndex + i;
     if (index >= _size) index -= _size;
     return data[index];
+}

src/framebuffer.h

➞

Show inline comments

 /*
   Copyright © 2015 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
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef FRAMEBUFFER_H
 #define FRAMEBUFFER_H
 #include <QPointF>
 #include <QRectF>
 class FrameBuffer
+{
 public:
     FrameBuffer(size_t size);
     ~FrameBuffer();
     void resize(size_t size);
     void addSamples(double* samples, size_t size);
     void clear(); // fill 0
     // QwtSeriesData implementations
+    // QwtSeriesData related implementations
     size_t size() const;
     QPointF sample(size_t i) const;
     QRectF boundingRect() const;
     double sample(size_t i) const;
 private:
     size_t _size; // size of `data`
     double* data;
     size_t headIndex; // indicates the actual `0` index of the ring buffer
     QRectF _boundingRect;
     double _sample(size_t i) const;
 };
 #endif // FRAMEBUFFER_H

src/framebufferseries.cpp

➞

Show inline comments

 #include "framebufferseries.h"
 FrameBufferSeries::FrameBufferSeries(FrameBuffer* buffer)
+{
     _buffer = buffer;
+}
 size_t FrameBufferSeries::size() const
+{
     return _buffer->size();
+}
 QPointF FrameBufferSeries::sample(size_t i) const
+{
     return _buffer->sample(i);
+    return QPointF(i, _buffer->sample(i));
+}
 QRectF FrameBufferSeries::boundingRect() const
+{
     return _buffer->boundingRect();
+}

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -435,91 +435,91 @@ void MainWindow::enableDemo(bool enabled @@
             ui->actionDemoMode->setChecked(true);
             demoIndicator.show();
             ui->plot->replot();
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         dataFormatPanel.enableDemo(false);
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();
         ui->plot->replot();
+    }
+}
 void MainWindow::onExportCsv()
+{
     bool wasPaused = ui->actionPause->isChecked();
     ui->actionPause->setChecked(true); // pause plotting
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull())  // user canceled export
+    {
         ui->actionPause->setChecked(wasPaused);
+    }
     else
+    {
         QFile file(fileName);
         if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+        {
             QTextStream fileStream(&file);
             unsigned numOfChannels = channelMan.numOfChannels();
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 fileStream << "Channel " << ci;
                 if (ci != numOfChannels-1) fileStream << ",";
+            }
             fileStream << '\n';
             for (unsigned int i = 0; i < numOfSamples; i++)
+            {
                 for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
-                    fileStream << channelMan.channelBuffer(ci)->sample(i).y();
                     fileStream << channelMan.channelBuffer(ci)->sample(i);
                     if (ci != numOfChannels-1) fileStream << ",";
+                }
                 fileStream << '\n';
+            }
+        }
         else
+        {
             qCritical() << "File open error during export: " << file.error();
+        }
+    }
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
     QString logString;
     switch (type)
+    {
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -28,97 +28,97 @@ @@
 #include "snapshotmanager.h"
 SnapshotManager::SnapshotManager(QMainWindow* mainWindow,
                                  ChannelManager* channelMan) :
     _menu("Snapshots"),
     _takeSnapshotAction("Take Snapshot", this),
     loadSnapshotAction("Load Snapshots", this),
     clearAction("Clear Snapshots", this)
+{
     _mainWindow = mainWindow;
     _channelMan = channelMan;
     _takeSnapshotAction.setToolTip("Take a snapshot of current plot");
     _takeSnapshotAction.setShortcut(QKeySequence("F5"));
     loadSnapshotAction.setToolTip("Load snapshots from CSV files");
     clearAction.setToolTip("Delete all snapshots");
     connect(&_takeSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(takeSnapshot()));
     connect(&clearAction, SIGNAL(triggered(bool)),
             this, SLOT(clearSnapshots()));
     connect(&loadSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(loadSnapshots()));
     updateMenu();
+}
 SnapshotManager::~SnapshotManager()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
+}
 void SnapshotManager::takeSnapshot()
+{
     QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");
     auto snapshot = new Snapshot(_mainWindow, name);
     unsigned numOfChannels = _channelMan->numOfChannels();
     unsigned numOfSamples = _channelMan->numOfSamples();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         snapshot->data.append(QVector<QPointF>(numOfSamples));
         for (unsigned i = 0; i < numOfSamples; i++)
+        {
             snapshot->data[ci][i] = _channelMan->channelBuffer(ci)->sample(i);
+            snapshot->data[ci][i] = QPointF(i, _channelMan->channelBuffer(ci)->sample(i));
+        }
+    }
     addSnapshot(snapshot);
+}
 void SnapshotManager::addSnapshot(Snapshot* snapshot, bool update_menu)
+{
     snapshots.append(snapshot);
     QObject::connect(snapshot, &Snapshot::deleteRequested,
                      this, &SnapshotManager::deleteSnapshot);
     if (update_menu) updateMenu();
+}
 void SnapshotManager::updateMenu()
+{
     _menu.clear();
     _menu.addAction(&_takeSnapshotAction);
     _menu.addAction(&loadSnapshotAction);
     if (snapshots.size())
+    {
         _menu.addSeparator();
         for (auto ss : snapshots)
+        {
             _menu.addAction(ss->showAction());
+        }
         _menu.addSeparator();
         _menu.addAction(&clearAction);
+    }
+}
 void SnapshotManager::clearSnapshots()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
     snapshots.clear();
     updateMenu();
+}
 void SnapshotManager::deleteSnapshot(Snapshot* snapshot)
+{
     snapshots.removeOne(snapshot);
     snapshot->deleteLater(); // regular delete causes a crash when triggered from menu
     updateMenu();
+}

0 comments (0 inline, 0 general)