tempo-plotter Changeset - df800179c68c · protofusion repositories

Changeset - df800179c68c

Parent rev.

Child rev.

[Not reviewed]

stream

0 4 2

Hasan Yavuz ÖZDERYA - 8 years ago 2017-12-09 15:58:29
hy@ozderya.net

added linear scale index buffer

6 files changed with 150 insertions and 6 deletions:

src/framebuffer2.h

src/indexbuffer.h

src/linindexbuffer.cpp

src/linindexbuffer.h

tests/CMakeLists.txt

tests/test.cpp

0 comments (0 inline, 0 general)

src/framebuffer2.h

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ @@
 #ifndef FRAMEBUFFER_H
 #define FRAMEBUFFER_H
 struct Range
+{
-    double min, max;
+    double start, end;
 };
 /// Abstract base class for all frame buffers.
 class FrameBuffer
+{
 public:

src/indexbuffer.h

➞

Show inline comments

@@ @@ -21,13 +21,15 @@ @@
 #define INDEXBUFFER_H
 // IMPORTANT TODO: rename to "framebuffer.h" when stream work is done.
 #include "framebuffer2.h"
 /// A simple frame buffer that simply returns requested index as
 /// value.
 /// sample value.
 ///
 /// @note This buffer isn't for storing data.
 class IndexBuffer : public ResizableBuffer
+{
 public:
     IndexBuffer(unsigned n);
     unsigned size() const;

src/linindexbuffer.cpp

➞

Show inline comments

@@ new file 100644 @@
  /*
   Copyright © 2017 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 <QtGlobal>
 #include "linindexbuffer.h"
 LinIndexBuffer::LinIndexBuffer(unsigned n, Range lim)
+{
     Q_ASSERT(n > 0);
     _size = n;
     setLimits(lim);
+}
 unsigned LinIndexBuffer::size() const
+{
     return _size;
+}
 double LinIndexBuffer::sample(unsigned i) const
+{
     return _limits.start + i * _step;
+}
 Range LinIndexBuffer::limits() const
+{
     return _limits;
+}
 void LinIndexBuffer::resize(unsigned n)
+{
     _size = n;
     setLimits(_limits);         // called to update `_step`
+}
 void LinIndexBuffer::setLimits(Range lim)
+{
     _limits = lim;
     _step = (lim.end - lim.start) / (_size-1);
+}

src/linindexbuffer.h

➞

Show inline comments

@@ new file 100644 @@
  /*
   Copyright © 2017 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 LININDEXBUFFER_H
 #define LININDEXBUFFER_H
 // IMPORTANT TODO: rename to "framebuffer.h" when stream work is done.
 #include "framebuffer2.h"
 /// A dynamic frame buffer that start and end values can be set and
 /// intermediate values are calculated linearly.
 ///
 /// @note This buffer isn't for storing data.
 class LinIndexBuffer : public ResizableBuffer
+{
 public:
     LinIndexBuffer(unsigned n, Range lim);
     LinIndexBuffer(unsigned n, double min, double max) :
         LinIndexBuffer(n, {min, max}) {};
     unsigned size() const;
     double sample(unsigned i) const;
     Range limits() const;
     void resize(unsigned n);
     /// Sets minimum and maximum sample values of the buffer.
     void setLimits(Range lim);
 private:
     unsigned _size;
     Range _limits;
     double _step;
 };
 #endif

tests/CMakeLists.txt

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ include_directories("../src") @@
 add_executable(Test EXCLUDE_FROM_ALL
   test.cpp
   ../src/samplepack.cpp
   ../src/sink.cpp
   ../src/source.cpp
   ../src/indexbuffer.cpp
   ../src/linindexbuffer.cpp
+  )
 add_test(NAME test1 COMMAND Test)
 qt5_use_modules(Test Widgets)
 set(CMAKE_CTEST_COMMAND ctest -V)
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})

tests/test.cpp

➞

Show inline comments

@@ @@ -20,12 +20,13 @@ @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include "catch.hpp"
 #include "samplepack.h"
 #include "source.h"
 #include "indexbuffer.h"
 #include "linindexbuffer.h"
 TEST_CASE("samplepack with no X", "[memory]")
+{
     SamplePack pack(100, 3, false);
     REQUIRE_FALSE(pack.hasX());
@@ @@ -189,16 +190,49 @@ TEST_CASE("IndexBuffer", "[memory, buffe @@
     REQUIRE(buf.size() == 10);
     for (unsigned i = 0; i < 10; i++)
+    {
         REQUIRE(buf.sample(i) == i);
+    }
     auto l = buf.limits();
     REQUIRE(l.min == 0);
     REQUIRE(l.max == 9);
     REQUIRE(l.start == 0);
     REQUIRE(l.end == 9);
     buf.resize(20);
     REQUIRE(buf.size() == 20);
     REQUIRE(buf.sample(15) == 15);
     l = buf.limits();
     REQUIRE(l.min == 0);
     REQUIRE(l.max == 19);
     REQUIRE(l.start == 0);
     REQUIRE(l.end == 19);
+}
 TEST_CASE("LinIndexBuffer", "[memory, buffer]")
+{
     LinIndexBuffer buf(10, 0., 3.0);
     REQUIRE(buf.size() == 10);
     REQUIRE(buf.sample(0) == 0.);
     REQUIRE(buf.sample(9) == 3.0);
     REQUIRE(buf.sample(4) == Approx(1+1/3.));
     auto l = buf.limits();
     REQUIRE(l.start == 0.);
     REQUIRE(l.end == 3.);
     buf.resize(20);
     REQUIRE(buf.size() == 20);
     REQUIRE(buf.sample(0) == 0.);
     REQUIRE(buf.sample(9) == Approx(9.*3./19.));
     REQUIRE(buf.sample(4) == Approx(4.*3./19.));
     REQUIRE(buf.sample(19) == 3.0);
     l = buf.limits();
     REQUIRE(l.start == 0.);
     REQUIRE(l.end == 3.0);
     buf.setLimits({-5., 5.});
     l = buf.limits();
     REQUIRE(l.start == -5.0);
     REQUIRE(l.end == 5.0);
     REQUIRE(buf.sample(0) == -5.0);
     REQUIRE(buf.sample(19) == 5.0);
+}

0 comments (0 inline, 0 general)