tempo-plotter Changeset - e72a72afc304 · protofusion repositories

Changeset - e72a72afc304

Parent rev.

Child rev.

[Not reviewed]

gain-offset

0 3 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-07-09 15:38:35
hy@ozderya.net

added copy constructor for SamplePack

3 files changed with 35 insertions and 0 deletions:

src/samplepack.cpp

src/samplepack.h

tests/test.cpp

0 comments (0 inline, 0 general)

src/samplepack.cpp

➞

Show inline comments

 /*
   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.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <cstring>
 #include <QtGlobal>
 #include "samplepack.h"
 SamplePack::SamplePack(unsigned ns, unsigned nc, bool x)
+{
     Q_ASSERT(ns > 0 && nc > 0);
     _numSamples = ns;
     _numChannels = nc;
     _yData = new double[_numSamples * _numChannels]();
     if (x)
+    {
         _xData = new double[_numSamples]();
+    }
     else
+    {
         _xData = nullptr;
+    }
+}
 SamplePack::SamplePack(const SamplePack& other) :
     SamplePack(other.numSamples(), other.numChannels(), other.hasX())
+{
     size_t dataSize = sizeof(double) * numSamples();
     if (hasX())
         memcpy(xData(), other.xData(), dataSize);
     memcpy(_yData, other._yData, dataSize * numChannels());
+}
 SamplePack::~SamplePack()
+{
     delete[] _yData;
     if (_xData != nullptr)
+    {
         delete[] _xData;
+    }
+}
 bool SamplePack::hasX() const
+{
     return _xData != nullptr;
+}
 unsigned SamplePack::numChannels() const
+{
     return _numChannels;
+}
 unsigned SamplePack::numSamples() const
+{
     return _numSamples;
+}
 double* SamplePack::xData() const
+{
     Q_ASSERT(_xData != nullptr);
     return _xData;
+}
 double* SamplePack::data(unsigned channel) const
+{
     Q_ASSERT(channel < _numChannels);
     return &_yData[channel * _numSamples];
+}
 double* SamplePack::xData()
+{
     return const_cast<double*>(static_cast<const SamplePack&>(*this).xData());
+}
 double* SamplePack::data(unsigned channel)
+{
     return const_cast<double*>(static_cast<const SamplePack&>(*this).data(channel));
+}

src/samplepack.h

➞

Show inline comments

 /*
   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.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef SAMPLEPACK_H
 #define SAMPLEPACK_H
 class SamplePack
+{
 public:
     /**
      * @param ns number of samples
      * @param nc number of channels
      * @param x has X channel
      */
     SamplePack(unsigned ns, unsigned nc, bool x = false);
     SamplePack(const SamplePack& other);
     ~SamplePack();
     bool hasX() const;
     unsigned numChannels() const;
     unsigned numSamples() const;
     double* xData() const;
     double* data(unsigned channel) const;
     double* xData();
     double* data(unsigned channel);
 private:
     unsigned _numSamples, _numChannels;
     double* _xData;
     double* _yData;
 };
 #endif // SAMPLEPACK_H

tests/test.cpp

➞

Show inline comments

@@ @@ -10,96 +10,120 @@ @@
   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/>.
 */
 #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"
 #include "ringbuffer.h"
 #include "readonlybuffer.h"
 #include "test_helpers.h"
 TEST_CASE("samplepack with no X", "[memory]")
+{
     SamplePack pack(100, 3, false);
     REQUIRE_FALSE(pack.hasX());
     REQUIRE(pack.numChannels() == 3);
     REQUIRE(pack.numSamples() == 100);
     double* chan0 = pack.data(0);
     double* chan1 = pack.data(1);
     double* chan2 = pack.data(2);
     REQUIRE(chan0 == chan1 - 100);
     REQUIRE(chan1 == chan2 - 100);
+}
 TEST_CASE("samplepack with X", "[memory]")
+{
     SamplePack pack(100, 3, true);
     REQUIRE(pack.hasX());
     REQUIRE(pack.numChannels() == 3);
     REQUIRE(pack.numSamples() == 100);
     REQUIRE(pack.xData() != nullptr);
+}
 TEST_CASE("samplepack copy", "[memory]")
+{
     SamplePack pack(10, 3, true);
     // fill test data
     for (int i = 0; i < 10; i++)
+    {
         pack.xData()[i] = i;
         pack.data(0)[i] = i+5;
         pack.data(1)[i] = i*2;
         pack.data(2)[i] = i*3;
+    }
     SamplePack other = pack;
     // compare
     for (int i = 0; i < 10; i++)
+    {
         REQUIRE(other.xData()[i] == i);
         REQUIRE(other.data(0)[i] == i+5);
         REQUIRE(other.data(1)[i] == i*2);
         REQUIRE(other.data(2)[i] == i*3);
+    }
+}
 TEST_CASE("sink", "[memory, stream]")
+{
     TestSink sink;
     SamplePack pack(100, 3, false);
     sink.setNumChannels(3, false);
     REQUIRE(sink.numChannels() == 3);
     sink.feedIn(pack);
     REQUIRE(sink.totalFed == 100);
     sink.feedIn(pack);
     REQUIRE(sink.totalFed == 200);
     TestSink follower;
     sink.connectFollower(&follower);
     REQUIRE(follower.numChannels() == 3);
     REQUIRE(follower.hasX() == false);
     sink.feedIn(pack);
     REQUIRE(sink.totalFed == 300);
     REQUIRE(follower.totalFed == 100);
     sink.setNumChannels(2, true);
     REQUIRE(follower.numChannels() == 2);
     REQUIRE(follower.hasX() == true);
+}
 TEST_CASE("sink must be created unconnected", "[memory, stream]")
+{
     TestSink sink;
     REQUIRE(sink.connectedSource() == NULL);
+}
 TEST_CASE("source", "[memory, stream]")
+{
     TestSink sink;
     TestSource source(3, false);
     REQUIRE(source.numChannels() == 3);
     REQUIRE(source.hasX() == false);
     source.connectSink(&sink);
     REQUIRE(sink.numChannels() == 3);
     REQUIRE(sink.hasX() == false);
     source._setNumChannels(5, true);

0 comments (0 inline, 0 general)