tempo-plotter Changeset - 9a3e4ca7c84f · protofusion repositories

Changeset - 9a3e4ca7c84f

Parent rev.

Child rev.

[Not reviewed]

stream

0 5 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-05-26 15:43:58
hy@ozderya.net

disconnect previous source in `connectSink` function

5 files changed with 15 insertions and 13 deletions:

src/mainwindow.cpp

src/sink.cpp

src/sink.h

src/source.cpp

src/source.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -327,54 +327,48 @@ Try fixing the permissions of file: %1, @@
 void MainWindow::setupAboutDialog()
+{
     Ui_AboutDialog uiAboutDialog;
     uiAboutDialog.setupUi(&aboutDialog);
     QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,
                      [](){ QApplication::aboutQt();});
     QString aboutText = uiAboutDialog.lbAbout->text();
     aboutText.replace("$VERSION_STRING$", VERSION_STRING);
     aboutText.replace("$VERSION_REVISION$", VERSION_REVISION);
     uiAboutDialog.lbAbout->setText(aboutText);
+}
 void MainWindow::onPortToggled(bool open)
+{
     // make sure demo mode is disabled
     if (open && isDemoRunning()) enableDemo(false);
     ui->actionDemoMode->setEnabled(!open);
+}
 void MainWindow::setStreamSource(Source* source)
+{
     // disconnect previous source
     auto currentSource = stream.connectedSource();
     if (currentSource != nullptr)
+    {
         currentSource->disconnect((Sink*) &stream);
+    }
     // connect to new source
     source->connectSink(&stream);
+}
 void MainWindow::clearPlot()
+{
     stream.clear();
     plotMan->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;
     stream.setNumSamples(value);
     plotMan->replot();
+}
 void MainWindow::onSpsChanged(unsigned sps)
+{
     spsLabel.setText(QString::number(sps) + "sps");
+}
 bool MainWindow::isDemoRunning()
+{

src/sink.cpp

➞

Show inline comments

@@ @@ -32,39 +32,39 @@ void Sink::disconnectFollower(Sink* sink @@
+{
     Q_ASSERT(followers.contains(sink));
     followers.removeOne(sink);
+}
 void Sink::feedIn(const SamplePack& data)
+{
     for (auto sink : followers)
+    {
         sink->feedIn(data);
+    }
+}
 void Sink::setNumChannels(unsigned nc, bool x)
+{
     _numChannels = nc;
     _hasX = x;
     for (auto sink : followers)
+    {
         sink->setNumChannels(nc, x);
+    }
+}
-void Sink::setSource(const Source* s)
 void Sink::setSource(Source* s)
+{
     Q_ASSERT((source == nullptr) != (s == nullptr));
     source = s;
+}
 const Source* Sink::connectedSource() const
+{
     return source;
+}
 Source* Sink::connectedSource()
+{
     return const_cast<Source*>(static_cast<const Sink&>(*this).connectedSource());
+}

src/sink.h

➞

Show inline comments

@@ @@ -32,40 +32,42 @@ public: @@
     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);
     /// Returns the connected source. `nullptr` if it's not connected.
     const Source* connectedSource() const;
     Source* connectedSource();
 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);
     /// Set by the connected source when its connected. When
     /// disconnecting it's set to `NULL`.
     /// disconnecting it's set to `nullptr`.
     ///
     /// @note Previous source is disconnected.
     ///
     /// @important Trying to connect a source while its already
     /// connected is an error.
-    void setSource(const Source* s);
     void setSource(Source* s);
     friend Source;
 private:
     QList<Sink*> followers;
-    const Source* source = nullptr;   ///< source that this sink is connected to
     Source* source = nullptr;   ///< source that this sink is connected to
     bool _hasX;
     unsigned _numChannels;
 };
 #endif // SINK_H

src/source.cpp

➞

Show inline comments

@@ @@ -11,49 +11,54 @@ @@
   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(nullptr);
+    }
+}
 void Source::connectSink(Sink* sink)
+{
     Q_ASSERT(!sinks.contains(sink));
     Q_ASSERT(sink->connectedSource() == nullptr);
     auto prevSource = sink->connectedSource();
     if (prevSource != nullptr)
+    {
         prevSource->disconnect(sink);
+    }
     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(nullptr);
     sinks.removeOne(sink);
+}
 void Source::disconnectSinks()
+{
     while (!sinks.isEmpty())
+    {
         auto sink = sinks.takeFirst();
         sink->setSource(nullptr);
+    }
+}

src/source.h

➞

Show inline comments

@@ @@ -16,48 +16,49 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #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.
     /// Connects a sink to this source.
     ///
     /// If `Sink` is already connected to a source, it's disconnected first.
     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

0 comments (0 inline, 0 general)