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

@@ @@ -36,25 +36,25 @@ FrameBuffer::~FrameBuffer() @@
 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
@@ @@ -132,28 +132,23 @@ void FrameBuffer::addSamples(double* sam @@
+}
 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

@@ @@ -24,28 +24,26 @@ @@
 #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

@@ @@ -4,19 +4,19 @@ @@
 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

@@ @@ -471,25 +471,25 @@ void MainWindow::onExportCsv() @@
             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();
+        }
+    }
+}

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -64,25 +64,25 @@ 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();

0 comments (0 inline, 0 general)