# HG changeset patch
# User Hasan Yavuz ÖZDERYA <hy@ozderya.net>
# Date 2020-01-29 15:27:34
# Node ID 5e8115ecea3b769e864fbd66a156e3672480ee44
# Parent  71441196d1c5d700dd901c7a8f5502a4ff25f72b

make chunked buffer based on FrameBuffer

diff --git a/src/chunkedbuffer.cpp b/src/chunkedbuffer.cpp
--- a/src/chunkedbuffer.cpp
+++ b/src/chunkedbuffer.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2020 Hasan Yavuz Özderya
 
   This file is part of serialplot.
 
@@ -36,11 +36,11 @@ ChunkedBuffer::~ChunkedBuffer()
     }
 }
 
-void ChunkedBuffer::addSamples(double* samples, size_t size)
+void ChunkedBuffer::addSamples(double* samples, unsigned n)
 {
     size_t i = 0;
 
-    while (i < size)
+    while (i < n)
     {
         // select chunk to add data
         auto chunk = chunks.last();
@@ -50,12 +50,12 @@ void ChunkedBuffer::addSamples(double* s
         }
 
         // add data to chunk
-        size_t c = std::min(chunk->left(), (size - i));
+        size_t c = std::min(chunk->left(), (n - i));
         chunk->addSamples(&samples[i], c);
         i += c;
     }
 
-    _size += size;
+    _size += n;
 }
 
 void ChunkedBuffer::clear()
@@ -81,12 +81,12 @@ DataChunk* ChunkedBuffer::addNewChunk()
     return chunk;
 }
 
-size_t ChunkedBuffer::size() const
+unsigned ChunkedBuffer::size() const
 {
     return _size;
 }
 
-QRectF ChunkedBuffer::boundingRect() const
+Range ChunkedBuffer::limits() const
 {
     // TODO: it should be possible to cache boundingRect and only
     // update on 'addSamples' and when dropping chunks
@@ -100,12 +100,17 @@ QRectF ChunkedBuffer::boundingRect() con
         ymax = std::max(ymax, c->max());
     }
 
-    return QRectF(0, ymax, _size, (ymax-ymin));
+    return {ymin, ymax};
 }
 
-double ChunkedBuffer::sample(size_t i) const
+double ChunkedBuffer::sample(unsigned i) const
 {
     int chunk_index = i / CHUNK_SIZE;
     int chunk_offset = i % CHUNK_SIZE;
     return chunks[chunk_index]->sample(chunk_offset);
 }
+
+void ChunkedBuffer::resize(unsigned n)
+{
+    // TODO what to do for ChunkedBuffer::resize
+}
diff --git a/src/chunkedbuffer.h b/src/chunkedbuffer.h
--- a/src/chunkedbuffer.h
+++ b/src/chunkedbuffer.h
@@ -1,5 +1,5 @@
 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2020 Hasan Yavuz Özderya
 
   This file is part of serialplot.
 
@@ -25,22 +25,23 @@
 #include <QVector>
 
 #include "datachunk.h"
+#include "framebuffer.h"
 
 #define CHUNK_SIZE (1024)
 
-class ChunkedBuffer
+class ChunkedBuffer : public WFrameBuffer
 {
 public:
     ChunkedBuffer();
     ~ChunkedBuffer();
 
-    void addSamples(double* samples, size_t size);
-    void clear();
-
-    // QwtSeriesData related implementations
-    size_t size() const;
-    QRectF boundingRect() const;
-    double sample(size_t i) const;
+    // FrameBuffer related implementations
+    virtual unsigned size() const;
+    virtual double sample(unsigned i) const;
+    virtual Range limits() const;
+    virtual void resize(unsigned n);
+    virtual void addSamples(double* samples, unsigned n);
+    virtual void clear();
 
 private:
     size_t _size; // size of `data`
diff --git a/tests/test.cpp b/tests/test.cpp
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2020 Hasan Yavuz Özderya
 
   This file is part of serialplot.
 
@@ -454,7 +454,8 @@ TEST_CASE("ChunkedBuffer created empty",
     ChunkedBuffer b;
 
     REQUIRE(b.size() == 0);
-    REQUIRE(b.boundingRect() == QRectF(0,0,0,0));
+    REQUIRE(b.limits().start == 0);
+    REQUIRE(b.limits().end == 0);
 }
 
 TEST_CASE("ChunkedBuffer adding data and clearing", "[memory]")
@@ -467,24 +468,28 @@ TEST_CASE("ChunkedBuffer adding data and
     b.addSamples(samples, N);
 
     REQUIRE(b.size() == N);
-    REQUIRE(b.boundingRect() == QRectF(0,10,N,9));
+    REQUIRE(b.limits().start == 1);
+    REQUIRE(b.limits().end == 10);
 
     // add data to fill the chunk
     double samples2[CHUNK_SIZE-N] = {0};
     b.addSamples(samples2, CHUNK_SIZE-N);
     REQUIRE(b.size() == CHUNK_SIZE);
-    REQUIRE(b.boundingRect() == QRectF(0,10,CHUNK_SIZE,10));
+    REQUIRE(b.limits().start == 0);
+    REQUIRE(b.limits().end == 10);
 
     // add data for second chunk
     b.addSamples(samples, N);
     REQUIRE(b.size() == CHUNK_SIZE+N);
-    REQUIRE(b.boundingRect() == QRectF(0,10,CHUNK_SIZE+N,10));
+    REQUIRE(b.limits().start == 0);
+    REQUIRE(b.limits().end == 10);
 
     // add more data to make it 4 chunks
     double samples3[CHUNK_SIZE*3-N] = {0};
     b.addSamples(samples3, CHUNK_SIZE*3-N);
     REQUIRE(b.size() == CHUNK_SIZE*4);
-    REQUIRE(b.boundingRect() == QRectF(0,10,CHUNK_SIZE*4,10));
+    REQUIRE(b.limits().start == 0);
+    REQUIRE(b.limits().end == 10);
 
     // clear
     b.clear();