tempo-plotter Changeset - 5faf2cdfb6a5 · protofusion repositories

Changeset - 5faf2cdfb6a5

Parent rev.

Child rev.

[Not reviewed]

stream

0 5 2

Hasan Yavuz ÖZDERYA - 7 years ago 2018-05-26 17:26:08
hy@ozderya.net

added new sample per second counter

7 files changed with 105 insertions and 16 deletions:

CMakeLists.txt

src/dataformatpanel.h

src/demoreader.h

src/mainwindow.cpp

src/mainwindow.h

src/samplecounter.cpp

src/samplecounter.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -145,12 +145,13 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   src/updatechecker.cpp
   src/versionnumber.cpp
   src/updatecheckdialog.cpp
   src/samplepack.cpp
   src/source.cpp
   src/sink.cpp
   src/samplecounter.cpp
   misc/windows_icon.rc
   ${UI_FILES}
   ${RES_FILES}
+  )
 # Use the Widgets module from Qt 5.

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -60,13 +60,12 @@ public slots: @@
     void enableDemo(bool); // demo shouldn't be enabled when port is open
 signals:
     /// Active (selected) reader has changed.
     void sourceChanged(Source* source);
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
 private:
     Ui::DataFormatPanel *ui;
     QSerialPort* serialPort;

src/demoreader.h

➞

Show inline comments

@@ @@ -50,16 +50,12 @@ public: @@
 public slots:
     void pause(bool);
     /// Sets the number of channels, this doesn't trigger a `numOfChannelsChanged` signal.
     void setNumOfChannels(unsigned value);
 signals:
     // TODO: added for build only, remove later
     void samplesPerSecondChanged(unsigned);
 private:
     bool paused;
     unsigned _numChannels;
     QTimer timer;
     int count;

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -220,27 +220,26 @@ MainWindow::MainWindow(QWidget *parent) @@
     plotMan->setPlotWidth(plotControlPanel.plotWidth());
     // Init sps (sample per second) counter
     spsLabel.setText("0sps");
     spsLabel.setToolTip("samples per second (per channel)");
     ui->statusBar->addPermanentWidget(&spsLabel);
     QObject::connect(&dataFormatPanel,
                      &DataFormatPanel::samplesPerSecondChanged,
                      this, &MainWindow::onSpsChanged);
     connect(&sampleCounter, &SampleCounter::spsChanged,
             this, &MainWindow::onSpsChanged);
     // init demo
     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());
             this, &MainWindow::onSourceChanged);
     onSourceChanged(dataFormatPanel.activeSource());
     // load default settings
     QSettings settings("serialplot", "serialplot");
     loadAllSettings(&settings);
     // ensure command panel has 1 command if none loaded
@@ @@ -343,16 +342,16 @@ 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)
+void MainWindow::onSourceChanged(Source* source)
+{
     // connect to new source
     source->connectSink(&stream);
     source->connectSink(&sampleCounter);
+}
 void MainWindow::clearPlot()
+{
     stream.clear();
     plotMan->replot();
@@ @@ -362,15 +361,16 @@ void MainWindow::onNumOfSamplesChanged(i @@
+{
     numOfSamples = value;
     stream.setNumSamples(value);
     plotMan->replot();
+}
-void MainWindow::onSpsChanged(unsigned sps)
+void MainWindow::onSpsChanged(float sps)
+{
     spsLabel.setText(QString::number(sps) + "sps");
     int precision = sps < 1. ? 3 : 0;
     spsLabel.setText(QString::number(sps, 'f', precision) + "sps");
+}
 bool MainWindow::isDemoRunning()
+{
     return ui->actionDemoMode->isChecked();
+}

src/mainwindow.h

➞

Show inline comments

@@ @@ -42,12 +42,13 @@ @@
 #include "ui_about_dialog.h"
 #include "stream.h"
 #include "snapshotmanager.h"
 #include "plotmanager.h"
 #include "plotmenu.h"
 #include "updatecheckdialog.h"
 #include "samplecounter.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
@@ @@ -77,12 +78,13 @@ private: @@
     QList<QwtPlotCurve*> curves;
     // ChannelManager channelMan;
     Stream stream;
     PlotManager* plotMan;
     QWidget* secondaryPlot;
     SnapshotManager snapshotMan;
     SampleCounter sampleCounter;
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     RecordPanel recordPanel;
     PlotControlPanel plotControlPanel;
@@ @@ -107,17 +109,17 @@ private: @@
     /// `QWidget::closeEvent` handler
     void closeEvent(QCloseEvent * event);
 private slots:
     void onPortToggled(bool open);
-    void setStreamSource(Source* source);
+    void onSourceChanged(Source* source);
     void onNumOfSamplesChanged(int value);
     void clearPlot();
-    void onSpsChanged(unsigned sps);
+    void onSpsChanged(float sps);
     void enableDemo(bool enabled);
     void showBarPlot(bool show);
     void onExportCsv();
     void onSaveSettings();
     void onLoadSettings();

src/samplecounter.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 <QDateTime>
 #include "samplecounter.h"
 SampleCounter::SampleCounter()
+{
     prevTimeMs = QDateTime::currentMSecsSinceEpoch();
     count = 0;
+}
 #include <QtDebug>
 void SampleCounter::feedIn(const SamplePack& data)
+{
     count += data.numSamples();
     qint64 current = QDateTime::currentMSecsSinceEpoch();
     auto diff = current - prevTimeMs;
     if (diff > 1000) // 1sec
+    {
         emit spsChanged(1000 * float(count) / diff);
         prevTimeMs = current;
         count = 0;
+    }
+}

src/samplecounter.h

➞

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/>.
 */
 #ifndef SAMPLECOUNTER_H
 #define SAMPLECOUNTER_H
 #include <QObject>
 #include "sink.h"
 /// A `Sink` class for counting and reporting number of samples per second.
 class SampleCounter : public QObject, public Sink
+{
     Q_OBJECT
 public:
     SampleCounter();
 protected:
     // implementations for `Sink`
     virtual void feedIn(const SamplePack& data);
 signals:
     /// Emitted per second if SPS value has changed.
     void spsChanged(float value);
 private:
     qint64 prevTimeMs;
     unsigned count;
 };
 #endif // SAMPLECOUNTER_H

0 comments (0 inline, 0 general)