tempo-plotter Changeset - fdf5f056db8f · protofusion repositories

Changeset - fdf5f056db8f

Parent rev.

Child rev.

[Not reviewed]

new-reader

0 3 2

Hasan Yavuz ÖZDERYA - 9 years ago 2016-05-23 16:46:43
hy@ozderya.net

moved demo mode implementation to a special reader

5 files changed with 165 insertions and 33 deletions:

CMakeLists.txt

src/dataformatpanel.cpp

src/dataformatpanel.h

src/demoreader.cpp

src/demoreader.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -101,12 +101,13 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   src/endiannessbox.cpp
   src/abstractreader.cpp
   src/binarystreamreader.cpp
   src/binarystreamreadersettings.cpp
   src/asciireader.cpp
   src/asciireadersettings.cpp
   src/demoreader.cpp
   misc/windows_icon.rc
   ${UI_FILES}
   ${RES_FILES}
+  )
 # Use the Widgets module from Qt 5.

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -29,14 +29,15 @@ @@
 DataFormatPanel::DataFormatPanel(QSerialPort* port,
                                  ChannelManager* channelMan,
                                  QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel),
     bsReader(port, channelMan),
     asciiReader(port, channelMan)
     bsReader(port, channelMan, this),
     asciiReader(port, channelMan, this),
     demoReader(port, channelMan, this)
+{
     ui->setupUi(this);
     serialPort = port;
     _channelMan = channelMan;
     paused = false;
@@ @@ -60,17 +61,15 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     connect(ui->rbAscii, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&asciiReader);
             });
     // Init demo mode
     demoCount = 0;
     demoTimer.setInterval(100);
     QObject::connect(&demoTimer, &QTimer::timeout,
                      this, &DataFormatPanel::demoTimerTimeout);
     // re-purpose numofchannels settings from actual reader settings to demo reader
     connect(this, &DataFormatPanel::numOfChannelsChanged,
             &demoReader, &DemoReader::setNumOfChannels);
+}
 DataFormatPanel::~DataFormatPanel()
+{
     delete ui;
+}
@@ @@ -80,41 +79,29 @@ unsigned DataFormatPanel::numOfChannels( @@
     return currentReader->numOfChannels();
+}
 void DataFormatPanel::pause(bool enabled)
+{
     currentReader->pause(enabled);
     demoReader.pause(enabled);
+}
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoTimer.start();
         demoReader.enable();
         connect(&demoReader, &DemoReader::dataAdded,
                 this, &DataFormatPanel::dataAdded);
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
+    }
     else
+    {
         demoTimer.stop();
+    }
+}
 void DataFormatPanel::demoTimerTimeout()
+{
     const double period = 100;
     demoCount++;
     if (demoCount >= 100) demoCount = 0;
     if (!paused)
+    {
         for (unsigned ci = 0; ci < currentReader->numOfChannels(); ci++)
+        {
             // we are calculating the fourier components of square wave
             double value = 4*sin(2*M_PI*double((ci+1)*demoCount)/period)/((2*(ci+1))*M_PI);
             addChannelData(ci, &value, 1);
+        }
         emit dataAdded();
         demoReader.enable(false);
         disconnect(&demoReader, 0, this, 0);
+    }
+}
 void DataFormatPanel::addChannelData(unsigned int channel,
                                      double* data, unsigned size)
+{

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -28,12 +28,13 @@ @@
 #include <QtGlobal>
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "demoreader.h"
 namespace Ui {
 class DataFormatPanel;
+}
 class DataFormatPanel : public QWidget
@@ @@ -69,18 +70,13 @@ private: @@
     AbstractReader* currentReader;
     /// Disable current reader and enable a another one
     void selectReader(AbstractReader* reader);
     bool paused; // remove
     // demo
     QTimer demoTimer;
     int demoCount;
     DemoReader demoReader;
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, double* data, unsigned size);
 private slots:
     void demoTimerTimeout();
 };
 #endif // DATAFORMATPANEL_H

src/demoreader.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2016 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 "demoreader.h"
 DemoReader::DemoReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
+{
     paused = false;
     _numOfChannels = 1;
     count = 0;
     timer.setInterval(100);
     QObject::connect(&timer, &QTimer::timeout,
                      this, &DemoReader::demoTimerTimeout);
+}
 QWidget* DemoReader::settingsWidget()
+{
     return NULL;
+}
 void DemoReader::enable(bool enabled)
+{
     if (enabled)
+    {
         timer.start();
+    }
     else
+    {
         timer.stop();
+    }
+}
 unsigned DemoReader::numOfChannels()
+{
     return _numOfChannels;
+}
 void DemoReader::setNumOfChannels(unsigned value)
+{
     _numOfChannels = value;
+}
 void DemoReader::pause(bool enabled)
+{
     paused = enabled;
+}
 void DemoReader::demoTimerTimeout()
+{
     const double period = 100;
     count++;
     if (count >= 100) count = 0;
     if (!paused)
+    {
         for (unsigned ci = 0; ci < _numOfChannels; ci++)
+        {
             // we are calculating the fourier components of square wave
             double value = 4*sin(2*M_PI*double((ci+1)*count)/period)/((2*(ci+1))*M_PI);
             _channelMan->addChannelData(ci, &value, 1);
             sampleCount++;
+        }
         emit dataAdded();
+    }
+}

src/demoreader.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2016 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 DEMOREADER_H
 #define DEMOREADER_H
 #include <QTimer>
 #include "abstractreader.h"
 /**
  * This is a special case of reader implementation and should be used
  * with care.
+ *
  * There is no settings widget. Number of channels should be set from
  * currently selected actual readers settings widget.
+ *
  * This reader should not be enabled when port is open!
  */
 class DemoReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit DemoReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     /// Demo reader is an exception so this function returns NULL
     QWidget* settingsWidget();
     unsigned numOfChannels();
     void enable(bool enabled = true);
 public slots:
     void pause(bool);
     /// Sets the number of channels, this doesn't trigger a `numOfChannelsChanged` signal.
     void setNumOfChannels(unsigned value);
 private:
     bool paused;
     unsigned _numOfChannels;
     QTimer timer;
     int count;
 private slots:
     void demoTimerTimeout();
 };
 #endif // DEMOREADER_H

0 comments (0 inline, 0 general)