tempo-plotter Changeset - d92b6daade5d · protofusion repositories

Changeset - d92b6daade5d

Parent rev.

Child rev.

[Not reviewed]

stream

0 7 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-05-22 15:46:18
hy@ozderya.net

plotting works, only demo is tested

switching readers when demo is enabled breaks demo

7 files changed with 34 insertions and 15 deletions:

src/dataformatpanel.cpp

src/mainwindow.cpp

src/mainwindow.h

src/sink.cpp

src/sink.h

src/source.cpp

src/stream.cpp

0 comments (0 inline, 0 general)

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -44,14 +44,12 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     currentReader = &bsReader;
     bsReader.enable();
     ui->rbBinary->setChecked(true);
     ui->horizontalLayout->addWidget(bsReader.settingsWidget(), 1);
     connect(&bsReader, SIGNAL(numOfChannelsChanged(unsigned)),
             this, SIGNAL(numOfChannelsChanged(unsigned)));
     connect(&bsReader, SIGNAL(samplesPerSecondChanged(unsigned)),
             this, SIGNAL(samplesPerSecondChanged(unsigned)));
     // initalize reader selection buttons
     connect(ui->rbBinary, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&bsReader);
             });
@@ @@ -95,14 +93,12 @@ void DataFormatPanel::pause(bool enabled @@
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoReader.enable();
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
         emit sourceChanged(&demoReader);
+    }
     else
+    {
         demoReader.enable(false);
         disconnect(&demoReader, 0, this, 0);
@@ @@ -117,14 +113,12 @@ void DataFormatPanel::selectReader(Abstr @@
     reader->enable();
     // re-connect signals
     disconnect(currentReader, 0, this, 0);
     connect(reader, SIGNAL(numOfChannelsChanged(unsigned)),
             this, SIGNAL(numOfChannelsChanged(unsigned)));
     connect(reader, SIGNAL(samplesPerSecondChanged(unsigned)),
             this, SIGNAL(samplesPerSecondChanged(unsigned)));
     // switch the settings widget
     ui->horizontalLayout->removeWidget(currentReader->settingsWidget());
     currentReader->settingsWidget()->hide();
     ui->horizontalLayout->addWidget(reader->settingsWidget(), 1);
     reader->settingsWidget()->show();

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -203,13 +203,13 @@ MainWindow::MainWindow(QWidget *parent) @@
+                         }
                      });
     connect(&serialPort, &QIODevice::aboutToClose,
             &recordPanel, &RecordPanel::onPortClose);
-    // init data arrays and plot
     // init plot
     numOfSamples = plotControlPanel.numOfSamples();
     stream.setNumSamples(numOfSamples);
     plotControlPanel.setChannelInfoModel(stream.infoModel());
     // init scales
     plotMan->setYAxis(plotControlPanel.autoScale(),
@@ @@ -231,12 +231,17 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      this, &MainWindow::enableDemo);
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      plotMan, &PlotManager::showDemoIndicator);
     // init stream connections
     connect(&dataFormatPanel, &DataFormatPanel::sourceChanged,
             this, &MainWindow::setStreamSource);
     setStreamSource(dataFormatPanel.activeSource());
     // load default settings
     QSettings settings("serialplot", "serialplot");
     loadAllSettings(&settings);
     // ensure command panel has 1 command if none loaded
     if (!commandPanel.numOfCommands())
@@ @@ -338,12 +343,24 @@ 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();
+}

src/mainwindow.h

➞

Show inline comments

@@ @@ -109,13 +109,13 @@ private: @@
     /// `QWidget::closeEvent` handler
     void closeEvent(QCloseEvent * event);
 private slots:
     void onPortToggled(bool open);
+    void setStreamSource(Source* source);
     void onNumOfSamplesChanged(int value);
     void clearPlot();
     void onSpsChanged(unsigned sps);
     void enableDemo(bool enabled);
     void showBarPlot(bool show);

src/sink.cpp

➞

Show inline comments

@@ @@ -52,14 +52,19 @@ void Sink::setNumChannels(unsigned nc, b @@
         sink->setNumChannels(nc, x);
+    }
+}
 void Sink::setSource(const Source* s)
+{
-    Q_ASSERT((source == NULL) != (s == NULL));
+    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

@@ @@ -36,14 +36,15 @@ public: @@
     void connectFollower(Sink* sink);
     /// Disconnects a follower. Disconnecting an unconnected sink is
     /// an error.
     void disconnectFollower(Sink* sink);
-    /// Returns the connected source. `NULL` if it's not connected.
+    /// 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);
@@ @@ -59,12 +60,12 @@ protected: @@
     void setSource(const Source* s);
     friend Source;
 private:
     QList<Sink*> followers;
-    const Source* source = NULL;   ///< source that this sink is connected to
+    const Source* source = nullptr;   ///< source that this sink is connected to
     bool _hasX;
     unsigned _numChannels;
 };
 #endif // SINK_H

src/source.cpp

➞

Show inline comments

@@ @@ -22,41 +22,41 @@ @@
 #include "source.h"
 Source::~Source()
+{
     for (auto sink : sinks)
+    {
-        sink->setSource(NULL);
+        sink->setSource(nullptr);
+    }
+}
 void Source::connectSink(Sink* sink)
+{
     Q_ASSERT(!sinks.contains(sink));
-    Q_ASSERT(sink->connectedSource() == NULL);
+    Q_ASSERT(sink->connectedSource() == nullptr);
     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);
+    sink->setSource(nullptr);
     sinks.removeOne(sink);
+}
 void Source::disconnectSinks()
+{
     while (!sinks.isEmpty())
+    {
         auto sink = sinks.takeFirst();
-        sink->setSource(NULL);
+        sink->setSource(nullptr);
+    }
+}
 void Source::feedOut(const SamplePack& data) const
+{
     for (auto sink : sinks)

src/stream.cpp

➞

Show inline comments

@@ @@ -154,12 +154,14 @@ void Stream::feedIn(const SamplePack& da @@
     for (unsigned i = 0; i < numChannels(); i++)
+    {
         static_cast<RingBuffer*>(channels[i]->yData())->addSamples(data.data(i), ns);
+    }
     Sink::feedIn(data);
     emit dataAdded();
+}
 void Stream::pause(bool paused)
+{
     _paused = paused;
+}

0 comments (0 inline, 0 general)