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

@@ @@ -45,7 +45,7 @@ void FrameBuffer::resize(size_t size) @@
     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
@@ @@ -141,17 +141,12 @@ 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;

src/framebuffer.h

➞

Show inline comments

@@ @@ -33,10 +33,10 @@ public: @@
     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`
@@ @@ -44,8 +44,6 @@ private: @@
     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

@@ @@ -13,7 +13,7 @@ size_t FrameBufferSeries::size() const @@
 QPointF FrameBufferSeries::sample(size_t i) const
+{
     return _buffer->sample(i);
+    return QPointF(i, _buffer->sample(i));
+}
 QRectF FrameBufferSeries::boundingRect() const

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -480,7 +480,7 @@ void MainWindow::onExportCsv() @@
+            {
                 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';

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -73,7 +73,7 @@ void SnapshotManager::takeSnapshot() @@
         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));
+        }
+    }

0 comments (0 inline, 0 general)