tempo-plotter Changeset - 42fdf0744adb · protofusion repositories

Changeset - 42fdf0744adb

Parent rev.

Child rev.

[Not reviewed]

stream

0 4 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-04-08 14:04:38
hy@ozderya.net

added reworked DemoReader with basic test cases

4 files changed with 65 insertions and 18 deletions:

src/demoreader.cpp

src/demoreader.h

tests/CMakeLists.txt

tests/test_readers.cpp

0 comments (0 inline, 0 general)

src/demoreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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
@@ @@ -22,18 +22,17 @@ @@
 #include "demoreader.h"
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 DemoReader::DemoReader(QIODevice* device, ChannelManager* channelMan,
                        DataRecorder* recorder, QObject* parent) :
     AbstractReader(device, channelMan, recorder, parent)
 DemoReader::DemoReader(QIODevice* device, QObject* parent) :
     AbstractReader(device, parent)
+{
     paused = false;
-    _numOfChannels = 1;
+    _numChannels = 1;
     count = 0;
     timer.setInterval(100);
     QObject::connect(&timer, &QTimer::timeout,
                      this, &DemoReader::demoTimerTimeout);
+}
@@ @@ -48,23 +47,25 @@ void DemoReader::enable(bool enabled) @@
+    {
         timer.start();
+    }
     else
+    {
         timer.stop();
         disconnectSinks();
+    }
+}
-unsigned DemoReader::numOfChannels()
+unsigned DemoReader::numChannels() const
+{
-    return _numOfChannels;
+    return _numChannels;
+}
 void DemoReader::setNumOfChannels(unsigned value)
+{
     _numOfChannels = value;
     _numChannels = value;
     updateNumChannels();
+}
 void DemoReader::pause(bool enabled)
+{
     paused = enabled;
+}
@@ @@ -74,16 +75,15 @@ void DemoReader::demoTimerTimeout() @@
     const double period = 100;
     count++;
     if (count >= 100) count = 0;
     if (!paused)
+    {
         double* samples = new double[_numOfChannels];
         for (unsigned ci = 0; ci < _numOfChannels; ci++)
         SamplePack samples(1, _numChannels);
         for (unsigned ci = 0; ci < _numChannels; ci++)
+        {
             // we are calculating the fourier components of square wave
-            samples[ci] = 4*sin(2*M_PI*double((ci+1)*count)/period)/((2*(ci+1))*M_PI);
+            samples.data(ci)[0] = 4*sin(2*M_PI*double((ci+1)*count)/period)/((2*(ci+1))*M_PI);
+        }
         addData(samples, _numOfChannels);
         delete[] samples;
         feedOut(samples);
+    }
+}

src/demoreader.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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
@@ @@ -35,31 +35,30 @@ @@
  */
 class DemoReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit DemoReader(QIODevice* device, ChannelManager* channelMan,
                         DataRecorder* recorder, QObject* parent = 0);
     explicit DemoReader(QIODevice* device, QObject* parent = 0);
     /// Demo reader is an exception so this function returns NULL
     QWidget* settingsWidget();
-    unsigned numOfChannels();
+    unsigned numChannels() const;
     void enable(bool enabled = true);
 public slots:
     void pause(bool);
     /// Sets the number of channels, this doesn't trigger a `numOfChannelsChanged` signal.
     void setNumOfChannels(unsigned value);
 private:
     bool paused;
-    unsigned _numOfChannels;
+    unsigned _numChannels;
     QTimer timer;
     int count;
 private slots:
     void demoTimerTimeout();
 };

tests/CMakeLists.txt

➞

Show inline comments

@@ @@ -58,12 +58,13 @@ add_executable(TestReaders EXCLUDE_FROM_ @@
   ../src/binarystreamreader.cpp
   ../src/binarystreamreadersettings.cpp
   ../src/asciireader.cpp
   ../src/asciireadersettings.cpp
   ../src/framedreader.cpp
   ../src/framedreadersettings.cpp
   ../src/demoreader.cpp
   ../src/commandedit.cpp
   ../src/endiannessbox.cpp
   ../src/numberformatbox.cpp
   ../src/numberformat.cpp
   ${UI_FILES_T}
+  )

tests/test_readers.cpp

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ @@
 #include <QSignalSpy>
 #include <QBuffer>
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "framedreader.h"
 #include "demoreader.h"
 #include "test_helpers.h"
 static const int READYREAD_TIMEOUT = 10; // milliseconds
 TEST_CASE("reading data with BinaryStreamReader", "[reader]")
@@ @@ -162,12 +163,58 @@ TEST_CASE("FramedReader shouldn't read w @@
     QSignalSpy spy(&bufferDev, SIGNAL(readyRead()));
     REQUIRE_FALSE(spy.wait(READYREAD_TIMEOUT));
     REQUIRE(sink.totalFed == 0);
+}
 TEST_CASE("DemoReader doesn't have a settings widget", "[reader, demo]")
+{
     QBuffer bufferDev;          // not actually used
     DemoReader reader(&bufferDev);
     REQUIRE(reader.settingsWidget() == NULL);
+}
 TEST_CASE("Generating data with DemoReader", "[reader, demo]")
+{
     QBuffer bufferDev;          // not actually used
     DemoReader demoReader(&bufferDev);
     demoReader.enable(true);
     TestSink sink;
     demoReader.connectSink(&sink);
     REQUIRE(sink._numChannels == 1);
     demoReader.setNumOfChannels(3);
     REQUIRE(sink._numChannels == 3);
     // we need to wait somehow, we are not actually looking for signals
     QSignalSpy spy(&bufferDev, SIGNAL(readyRead()));
     REQUIRE_FALSE(spy.wait(1000)); // we need some time for demoreader to produce data
     REQUIRE(sink.totalFed >= 9);
+}
 TEST_CASE("DemoReader shouldn't generate data when paused", "[reader, demo]")
+{
     QBuffer bufferDev;          // not actually used
     DemoReader demoReader(&bufferDev); // paused by default
     TestSink sink;
     demoReader.connectSink(&sink);
     REQUIRE(sink._numChannels == 1);
     demoReader.setNumOfChannels(3);
     REQUIRE(sink._numChannels == 3);
     // we need to wait somehow, we are not actually looking for signals
     QSignalSpy spy(&bufferDev, SIGNAL(readyRead()));
     REQUIRE_FALSE(spy.wait(1000)); // we need some time for demoreader to produce data
     REQUIRE(sink.totalFed == 0);
+}
 // Note: this is added because `QApplication` must be created for widgets
 #include <QApplication>
 int main(int argc, char* argv[])
+{
     QApplication a(argc, argv);

0 comments (0 inline, 0 general)