tempo-plotter Changeset - 42fdf0744adb · protofusion repositories

Changeset - 42fdf0744adb

Parent rev.

Child rev.

[Not reviewed]

stream

0 4 0

Hasan Yavuz ÖZDERYA - 8 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
   (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.
@@ @@ -16,74 +16,74 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <math.h>
 #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);
+}
 QWidget* DemoReader::settingsWidget()
+{
     return NULL;
+}
 void DemoReader::enable(bool enabled)
+{
     if (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;
+}
 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
   (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.
@@ @@ -29,39 +29,38 @@ @@
  * with care.
+ *
  * There is no settings widget. Number of channels should be set from
  * currently selected actual readers settings widget.
+ *
  * This reader should not be enabled when port is open!
  */
 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();
 };
 #endif // DEMOREADER_H

tests/CMakeLists.txt

➞

Show inline comments

@@ @@ -52,24 +52,25 @@ qt5_wrap_ui(UI_FILES_T @@
 add_executable(TestReaders EXCLUDE_FROM_ALL
   test_readers.cpp
   ../src/samplepack.cpp
   ../src/sink.cpp
   ../src/source.cpp
   ../src/abstractreader.cpp
   ../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}
+  )
 qt5_use_modules(TestReaders Widgets Test)
 add_test(NAME test_readers COMMAND TestReaders)
 set(CMAKE_CTEST_COMMAND ctest -V)
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 add_dependencies(check Test TestReaders)

tests/test_readers.cpp

➞

Show inline comments

@@ @@ -17,24 +17,25 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 // This tells Catch to provide a main() - only do this in one cpp file per executable
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
 #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]")
+{
     QBuffer bufferDev;
     BinaryStreamReader bs(&bufferDev);
     bs.enable(true);
     TestSink sink;
@@ @@ -156,22 +157,68 @@ TEST_CASE("FramedReader shouldn't read w @@
     REQUIRE(sink._hasX == false);
     bufferDev.open(QIODevice::ReadWrite);
     const uint8_t data[] = {0xAA, 0xBB, 4, 0x01, 0x02, 0x03, 0x04};
     bufferDev.write((const char*) data, 7);
     bufferDev.seek(0);
     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);
     int result = Catch::Session().run( argc, argv );
     return result;
+}

0 comments (0 inline, 0 general)