tempo-plotter Changeset - 8554454db965 · protofusion repositories

Changeset - 8554454db965

Parent rev.

Child rev.

[Not reviewed]

stream

0 3 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-03-26 15:52:23
hy@ozderya.net

added stream clear method to zero the buffers

3 files changed with 45 insertions and 1 deletions:

src/stream.cpp

src/stream.h

tests/test_stream.cpp

0 comments (0 inline, 0 general)

src/stream.cpp

➞

Show inline comments

@@ @@ -138,45 +138,53 @@ void Stream::feedIn(const SamplePack& da @@
+{
     Q_ASSERT(data.numChannels() == numChannels() &&
              data.hasX() == hasX());
     if (_paused) return;
     unsigned ns = data.numSamples();
     if (_hasx)
+    {
         static_cast<RingBuffer*>(xData)->addSamples(data.xData(), ns);
+    }
     for (unsigned i = 0; i < numChannels(); i++)
+    {
         static_cast<RingBuffer*>(channels[i]->yData())->addSamples(data.data(i), ns);
+    }
     Sink::feedIn(data);
+}
 void Stream::pause(bool paused)
+{
     _paused = paused;
+}
 void Stream::clear()
+{
     for (auto c : channels)
+    {
         static_cast<RingBuffer*>(c->yData())->clear();
+    }
+}
 void Stream::setNumSamples(unsigned value)
+{
     if (value == _numSamples) return;
     _numSamples = value;
     xData->resize(value);
     for (auto c : channels)
+    {
         static_cast<RingBuffer*>(c->yData())->resize(value);
+    }
+}
 void Stream::saveSettings(QSettings* settings) const
+{
     _infoModel.saveSettings(settings);
+}
 void Stream::loadSettings(QSettings* settings)
+{
     _infoModel.loadSettings(settings);
+}

src/stream.h

➞

Show inline comments

@@ @@ -64,37 +64,40 @@ public: @@
     void saveSettings(QSettings* settings) const;
     /// Load channel information
     void loadSettings(QSettings* settings);
 protected:
     // implementations for `Sink`
     virtual void setNumChannels(unsigned nc, bool x);
     virtual void feedIn(const SamplePack& data);
 signals:
     void numChannelsChanged(unsigned value);
     void numSamplesChanged(unsigned value);
     void channelAdded(const StreamChannel* chan);
     void channelNameChanged(unsigned channel, QString name); // TODO: does it stay?
     void dataAdded(); ///< emitted when data added to channel man.
 public slots:
     // TODO: these won't be public
     // void setNumChannels(unsigned number);
     void setNumSamples(unsigned value);
     /// When paused data feed is ignored
     void pause(bool paused);
     /// Clears buffer data (fills with 0)
     void clear();
 private:
     unsigned _numSamples;
     bool _paused;
     bool _hasx;
     ResizableBuffer* xData;
     QList<StreamChannel*> channels;
     ChannelInfoModel _infoModel;
 };
 #endif // STREAM_H

tests/test_stream.cpp

➞

Show inline comments

@@ @@ -158,56 +158,89 @@ TEST_CASE("adding data to a stream with @@
         const FrameBuffer* y = c->yData();
         for (unsigned i = 0; i < 5; i++)
+        {
             REQUIRE(y->sample(i) == 0);
+        }
         for (unsigned i = 5; i < 10; i++)
+        {
             REQUIRE(y->sample(i) == i-5);
+        }
+    }
     // check x
     const FrameBuffer* x = s.channel(0)->xData();
     for (unsigned i = 0; i < 5; i++)
+    {
         REQUIRE(x->sample(i) == 0);
+    }
     for (unsigned i = 5; i < 10; i++)
+    {
         REQUIRE(x->sample(i) == (i-5)+10);
+    }
+}
-TEST_CASE("paused stream shoulnd't store data", "[memory, stream, pause]")
+TEST_CASE("paused stream shouldn't store data", "[memory, stream, pause]")
+{
     Stream s(3, false, 10);
     // prepare data
     SamplePack pack(5, 3, false);
     for (unsigned ci = 0; ci < 3; ci++)
+    {
         for (unsigned i = 0; i < 5; i++)
+        {
             pack.data(ci)[i] = i;
+        }
+    }
     TestSource so(3, false);
     so.connect(&s);
     // test
     s.pause(true);
     so._feed(pack);
     for (unsigned ci = 0; ci < 3; ci++)
+    {
         const StreamChannel* c = s.channel(ci);
         const FrameBuffer* y = c->yData();
         for (unsigned i = 0; i < 10; i++)
+        {
             REQUIRE(y->sample(i) == 0);
+        }
+    }
+}
 TEST_CASE("clear stream data", "[memory, stream, pause]")
+{
     Stream s(3, false, 10);
     // prepare data
     SamplePack pack(5, 3, false);
     for (unsigned ci = 0; ci < 3; ci++)
+    {
         for (unsigned i = 0; i < 5; i++)
+        {
             pack.data(ci)[i] = i;
+        }
+    }
     TestSource so(3, false);
     so.connect(&s);
     // test
     so._feed(pack);
     s.clear();
     for (unsigned ci = 0; ci < 3; ci++)
+    {
         const StreamChannel* c = s.channel(ci);
         const FrameBuffer* y = c->yData();
         for (unsigned i = 0; i < 10; i++)
+        {
             REQUIRE(y->sample(i) == 0);
+        }
+    }
+}

0 comments (0 inline, 0 general)