tempo-plotter Changeset - 391ab62116c8 · protofusion repositories

Changeset - 391ab62116c8

Parent rev.

Child rev.

[Not reviewed]

stream

0 7 1

Hasan Yavuz ÖZDERYA - 8 years ago 2018-02-23 16:12:22
hy@ozderya.net

progress on unfinished stream class

8 files changed with 213 insertions and 21 deletions:

src/samplepack.h

src/sink.cpp

src/sink.h

src/source.h

src/stream.cpp

171

src/stream.h

src/streamchannel.cpp

src/streamchannel.h

0 comments (0 inline, 0 general)

src/samplepack.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

src/sink.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,13 +22,13 @@ @@
 void Sink::connectFollower(Sink* sink)
+{
     Q_ASSERT(!followers.contains(sink));
     followers.append(sink);
-    sink->setNumChannels(numChannels(), hasX());
+    sink->setNumChannels(_numChannels, _hasX);
+}
 void Sink::disconnectFollower(Sink* sink)
+{
     Q_ASSERT(followers.contains(sink));
@@ @@ -42,12 +42,14 @@ void Sink::feedIn(const SamplePack& data @@
         sink->feedIn(data);
+    }
+}
 void Sink::setNumChannels(unsigned nc, bool x)
+{
     _numChannels = nc;
     _hasX = x;
     for (auto sink : followers)
+    {
         sink->setNumChannels(nc, x);
+    }
+}

src/sink.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
@@ @@ -25,12 +25,14 @@ @@
 class Source;
 class Sink
+{
 public:
     /// Placeholder virtual destructor
     virtual ~Sink() {};
     /// Connects a sink to get any data that this sink
     /// gets. Connecting an already connected sink is an error.
     void connectFollower(Sink* sink);
     /// Disconnects a follower. Disconnecting an unconnected sink is
     /// an error.
     void disconnectFollower(Sink* sink);
@@ @@ -41,25 +43,23 @@ protected: @@
     /// Entry point for incoming data. Re-implementations should
     /// call this function to feed followers.
     virtual void feedIn(const SamplePack& data);
     /// Is set by connected source. Re-implementations should call
     /// this function to update followers.
     virtual void setNumChannels(unsigned nc, bool x);
     /// Returns true if sink has X data
     virtual bool hasX() const = 0;
     /// Returns number of channels
     virtual unsigned numChannels() const = 0;
     /// Set by the connected source when its connected. When
     /// disconnecting it's set to `NULL`.
     ///
     /// @important Trying to connect a source while its already
     /// connected is an error.
     void setSource(const Source* s);
     friend Source;
 private:
     QList<Sink*> followers;
     const Source* source = NULL;   ///< source that this sink is connected to
     bool _hasX;
     unsigned _numChannels;
 };
 #endif // SINK_H

src/source.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
@@ @@ -25,13 +25,17 @@ @@
 #include "sink.h"
 #include "samplepack.h"
 class Source
+{
 public:
     /// Placeholder virtual destructor
     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);
     /// Disconnects an already connected sink. Trying to disconnect an

src/stream.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   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 "stream.h"
 #include "ringbuffer.h"
 Stream::Stream(unsigned nc, bool x, unsigned ns) :
     _infoModel(nc)
+{
     _numSamples = ns;
     _paused = false;
     // create xdata buffer
     _hasx = x;
     if (x)
+    {
         xData = new RingBuffer(ns);
+    }
     else
+    {
         xData = new IndexBuffer(ns);
+    }
     // create channels
     for (unsigned i = 0; i < nc; i++)
+    {
         auto c = new StreamChannel(i, xData, new RingBuffer(ns), &_infoModel);
         channels.append(c);
+    }
+}
 Stream::~Stream()
+{
     // notify deletion
     // delete channels
+}
 bool Stream::hasX() const
+{
     return _hasx;
+}
 unsigned Stream::numChannels()
+{
     return channels.length();
+}
 unsigned Stream::numSamples() const
+{
     return _numSamples;
+}
 const StreamChannel* Stream::channel(unsigned index) const
+{
     Q_ASSERT(index < numChannels());
     return channels[index];
+}
 void Stream::setNumChannels(unsigned nc, bool x)
+{
     unsigned oldNum = numChannels();
     if (oldNum == nc && x == _hasX) return;
     // adjust the number of channels
     if (nc > oldNum)
+    {
         for (int i = oldNum; i < nc; i++)
+        {
             auto c = new StreamChannel(i, xData, new RingBuffer(ns), &_infoModel);
             channels.append(c);
+        }
+    }
     else if (nc < oldNum)
+    {
         for (int i = oldNum-1; i > nc-1; i--)
+        {
             delete channels.takeLast();
+        }
+    }
     // change the xdata
     if (x != _hasX)
+    {
         if (x)
+        {
             xData = new RingBuffer(ns);
+        }
         else
+        {
             xData = new IndexBuffer(ns);
+        }
         for (auto c : channels)
+        {
             c.setX(xData);
+        }
         _hasX = x;
+    }
     if (nc != oldNum)
+    {
         _infoModel.setNumChannels(nc);
         // TODO: how abut X change?
         emit numOfChannelsChanged(nc);
+    }
     Sink::setNumChannels(nc, x);
+}
 void Stream::feedIn(const SamplePack& data)
+{
     Q_ASSERT(data.numChannels() == numChannels() &&
              data.hasX() == hasX());
     if (_paused) return;
     unsigned ns = data.numSamples();
     if (_hasX)
+    {
         xData.addSamples(data.xData(), ns);
+    }
     for (unsigned i = 0; i < numChannels(); i++)
+    {
         channels[i].yData()->addSamples(data.data(i), ns);
+    }
     Sink::feedIn(data);
+}
 void Stream::pause(bool paused)
+{
     _paused = paused;
+}
 void Stream::setNumSamples(unsigned value)
+{
     if (value == _numSamples) return;
     _numSamples = value;
     xData.resize(value);
     for (auto c : channels)
+    {
         channels[i].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

 /*
-  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
@@ @@ -26,57 +26,71 @@ @@
 #include <QSettings>
 #include "sink.h"
 #include "source.h"
 #include "channelinfomodel.h"
 #include "streamchannel.h"
 #include "resizablebuffer.h"
 /**
  * Main waveform storage class. It consists of channels. Channels are
  * synchronized with each other.
+ *
  * Implements `Sink` class for data entry. It's expected to be
  * connected to a `Device` source. Also implements a `Source` class
  * for data that exists the buffers.
  */
-class Stream : public Sink, public Source, public QObject
 class Stream : public Sink, public QObject
+{
 public:
     /**
      * @param nc number of channels
      * @param ns number of samples
      */
     Stream(unsigned ns);
+    Stream(unsigned nc = 0, bool x = false, unsigned ns = 0);
     ~Stream();
     // implementations for `Source`
     virtual bool hasX() const;
     virtual unsigned numChannels();
     // implementations for `Sink`
     virtual void setNumChannels(unsigned nc, bool x);
     unsigned numSamples() const;
     const StreamChannel* channel(unsigned index) const;
     /// Saves channel information
     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 number);
     void setNumSamples(unsigned value);
     /// When paused data feed is ignored
     void pause(bool paused);
     /// When paused `addData` does nothing.
     void pause(bool paused);
 private:
     unsigned _numSamples;
     bool _paused;
     bool _hasx;
     ResizableBuffer* xData;
     QList<StreamChannel*> channels;
     ChannelInfoModel _infoModel;
 };
 #endif // STREAM_H

src/streamchannel.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
@@ @@ -38,6 +38,7 @@ QString StreamChannel::name() const {ret @@
 QColor StreamChannel::color() const {return _info->color(_index)};
 bool StreamChannel::visible() const {return _info->isVisible(_index)};
 const FrameBuffer* StreamChannel::xData() const {return _x;}
 const FrameBuffer* StreamChannel::yData() const {return _y;}
 FrameBuffer* StreamChannel::yData() {return _y;}
 const ChannelInfoModel* StreamChannel::info() const {return _info;}
 void StreamChannel::setX(const FrameBuffer* x) {_x = x};

src/streamchannel.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
@@ @@ -47,13 +47,13 @@ public: @@
     QColor color() const;
     bool visible() const;
     const FrameBuffer* xData() const;
     FrameBuffer* yData();
     const FrameBuffer* yData() const;
     const ChannelInfoModel* info() const;
+    void setX(const FrameBuffer* x);
 private:
     unsigned _index;
     const FrameBuffer* _x;
     FrameBuffer* _y;
     ChannelInfoModel* _info;

0 comments (0 inline, 0 general)