tempo-plotter Changeset - 2c5e57ebc103 · protofusion repositories

Changeset - 2c5e57ebc103

Parent rev.

Child rev.

[Not reviewed]

stream

0 4 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-04-03 16:08:38
hy@ozderya.net

remove ambiguity with `QObject::sink` method

4 files changed with 10 insertions and 10 deletions:

src/source.cpp

src/source.h

tests/test.cpp

tests/test_stream.cpp

0 comments (0 inline, 0 general)

src/source.cpp

➞

Show inline comments

@@ @@ -8,49 +8,49 @@ @@
   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 "source.h"
 Source::~Source()
+{
     for (auto sink : sinks)
+    {
         sink->setSource(NULL);
+    }
+}
-void Source::connect(Sink* sink)
+void Source::connectSink(Sink* sink)
+{
     Q_ASSERT(!sinks.contains(sink));
     Q_ASSERT(sink->connectedSource() == NULL);
     sinks.append(sink);
     sink->setSource(this);
     sink->setNumChannels(numChannels(), hasX());
+}
 void Source::disconnect(Sink* sink)
+{
     Q_ASSERT(sinks.contains(sink));
     Q_ASSERT(sink->connectedSource() == this);
     sink->setSource(NULL);
     sinks.removeOne(sink);
+}
 void Source::disconnectSinks()
+{
     while (!sinks.isEmpty())
+    {
         auto sink = sinks.takeFirst();
         sink->setSource(NULL);

src/source.h

➞

Show inline comments

@@ @@ -18,46 +18,46 @@ @@
 */
 #ifndef SOURCE_H
 #define SOURCE_H
 #include <QList>
 #include "sink.h"
 #include "samplepack.h"
 class Source
+{
 public:
     /// Virtual destructor. Must be called by implementors to notify sinks.
     virtual ~Source();
     /// Returns true if source has X data
     virtual bool hasX() const = 0;
     /// Returns number of channels
     virtual unsigned numChannels() const = 0;
     /// Connects a sink to this source. Trying to connect an already
     /// connected sink is an error.
-    void connect(Sink* sink);
+    void connectSink(Sink* sink);
     /// Disconnects an already connected sink. Trying to disconnect an
     /// unconnected sink is an error.
     void disconnect(Sink* sink);
     /// Disconnects all connected sinks.
     void disconnectSinks();
 protected:
     /// Feeds "in" given data to connected sinks
     virtual void feedOut(const SamplePack& data) const;
     /// Updates "number of channels" of connected sinks. Must be
     /// called when num. channels or hasX changes.
     void updateNumChannels() const;
 private:
     QList<Sink*> sinks;
 };
 #endif // SOURCE_H

tests/test.cpp

➞

Show inline comments

@@ @@ -77,86 +77,86 @@ TEST_CASE("sink", "[memory, stream]") @@
     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.connect(&sink);
+    source.connectSink(&sink);
     REQUIRE(sink.numChannels() == 3);
     REQUIRE(sink.hasX() == false);
     source._setNumChannels(5, true);
     REQUIRE(sink.numChannels() == 5);
     REQUIRE(sink.hasX() == true);
     SamplePack pack(100, 5, true);
     source._feed(pack);
     REQUIRE(sink.totalFed == 100);
     source.disconnect(&sink);
     source._feed(pack);
     REQUIRE(sink.totalFed == 100);
+}
 TEST_CASE("source must set/unset sink 'source'", "[memory, stream]")
+{
     TestSink sink;
     TestSource source(3, false);
-    source.connect(&sink);
+    source.connectSink(&sink);
     REQUIRE(sink.connectedSource() == &source);
     source.disconnect(&sink);
     REQUIRE(sink.connectedSource() == NULL);
+}
 TEST_CASE("source disconnect all sinks", "[memory, stream]")
+{
     TestSink sinks[3];
     TestSource source(3, false);
     // connect sinks
     for (int i = 0; i < 3; i++)
+    {
-        source.connect(&sinks[i]);
+        source.connectSink(&sinks[i]);
+    }
     source.disconnectSinks();
     for (int i = 0; i < 3; i++)
+    {
         REQUIRE(sinks[i].connectedSource() == NULL);
+    }
+}
 TEST_CASE("IndexBuffer", "[memory, buffer]")
+{
     IndexBuffer buf(10);
     REQUIRE(buf.size() == 10);
     for (unsigned i = 0; i < 10; i++)
+    {
         REQUIRE(buf.sample(i) == i);
+    }
     auto l = buf.limits();
     REQUIRE(l.start == 0);
     REQUIRE(l.end == 9);
     buf.resize(20);
     REQUIRE(buf.size() == 20);

tests/test_stream.cpp

➞

Show inline comments

@@ @@ -31,49 +31,49 @@ TEST_CASE("construction of stream with d @@
     REQUIRE(!s.hasX());
     REQUIRE(s.numSamples() == 0);
+}
 TEST_CASE("construction of stream with parameters", "[memory, stream]")
+{
     Stream s(4, true, 100);
     REQUIRE(s.numChannels() == 4);
     REQUIRE(s.hasX());
     REQUIRE(s.numSamples() == 100);
     for (unsigned i = 0; i < 4; i++)
+    {
         const StreamChannel* c = s.channel(i);
         REQUIRE(c != NULL);
         REQUIRE(c->index() == i);
+    }
+}
 TEST_CASE("changing stream number of channels via sink", "[memory, stream, sink]")
+{
     Stream s;
     TestSource so(3, false);
-    so.connect(&s);
+    so.connectSink(&s);
     // nc=3, x= false
     REQUIRE(s.numChannels() == 3);
     REQUIRE(!s.hasX());
     for (unsigned i = 0; i < 3; i++)
+    {
         const StreamChannel* c = s.channel(i);
         REQUIRE(c != NULL);
         REQUIRE(c->index() == i);
+    }
     // increase nc value, add X
     so._setNumChannels(5, true);
     REQUIRE(s.numChannels() == 5);
     REQUIRE(s.hasX());
     for (unsigned i = 0; i < 5; i++)
+    {
         const StreamChannel* c = s.channel(i);
         REQUIRE(c != NULL);
         REQUIRE(c->index() == i);
+    }
@@ @@ -85,162 +85,162 @@ TEST_CASE("changing stream number of cha @@
     for (unsigned i = 0; i < 1; i++)
+    {
         const StreamChannel* c = s.channel(i);
         REQUIRE(c != NULL);
         REQUIRE(c->index() == i);
+    }
+}
 TEST_CASE("adding data to a stream with no X", "[memory, stream, data, sink]")
+{
     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);
+    so.connectSink(&s);
     // test
     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 < 5; i++)
+        {
             REQUIRE(y->sample(i) == 0);
+        }
         for (unsigned i = 5; i < 10; i++)
+        {
             REQUIRE(y->sample(i) == i-5);
+        }
+    }
+}
 TEST_CASE("adding data to a stream with X", "[memory, stream, data, sink]")
+{
     Stream s(3, true, 10);
     // prepare data
     SamplePack pack(5, 3, true);
     for (unsigned ci = 0; ci < 3; ci++)
+    {
         for (unsigned i = 0; i < 5; i++)
+        {
             pack.data(ci)[i] = i;
+        }
+    }
     // x data
     for (unsigned i = 0; i < 5; i++)
+    {
         pack.xData()[i] = i+10;
+    }
     TestSource so(3, true);
-    so.connect(&s);
+    so.connectSink(&s);
     // test
     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 < 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 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);
+    so.connectSink(&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);
+    so.connectSink(&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)