tempo-plotter Changeset - 538d40c57b2b · protofusion repositories

Changeset - 538d40c57b2b

Parent rev.

Child rev.

[Not reviewed]

recording

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-14 05:58:51
hy@ozderya.net

moved buffer access to abstract reader class

6 files changed with 17 insertions and 18 deletions:

src/abstractreader.cpp

src/abstractreader.h

src/asciireader.cpp

src/binarystreamreader.cpp

src/demoreader.cpp

src/framedreader.cpp

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 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.
@@ @@ -35,12 +35,19 @@ AbstractReader::AbstractReader(QIODevice @@
+}
 void AbstractReader::spsTimerTimeout()
+{
     unsigned currentSps = samplesPerSecond;
     samplesPerSecond = (sampleCount/numOfChannels())/SPS_UPDATE_TIMEOUT;
     if (currentSps != samplesPerSecond)
+    {
         emit samplesPerSecondChanged(samplesPerSecond);
+    }
     sampleCount = 0;
+}
 void AbstractReader::addData(double* samples, unsigned length)
+{
     _channelMan->addData(samples, length);
     sampleCount += length;
     emit dataAdded();
+}

src/abstractreader.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 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.
@@ @@ -63,27 +63,28 @@ signals: @@
 public slots:
     /**
      * Pauses the reading.
+     *
      * Reader should actually continue reading to keep the
      * synchronization but shouldn't commit data.
      */
     virtual void pause(bool) = 0;
 protected:
     QIODevice* _device;
     ChannelManager* _channelMan;
     /// Implementing class should simply increase this count as samples are read
     unsigned sampleCount;
     /// Should be called with read data
     void addData(double* samples, unsigned length);
 private:
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     ChannelManager* _channelMan;
     unsigned sampleCount;
     unsigned samplesPerSecond;
     QTimer spsTimer;
 private slots:
     void spsTimerTimeout();
 };
 #endif // ABSTRACTREADER_H

src/asciireader.cpp

➞

Show inline comments

@@ @@ -20,25 +20,24 @@ @@
 #include <QtDebug>
 #include "asciireader.h"
 /// If set to this value number of channels is determined from input
 #define NUMOFCHANNELS_AUTO   (0)
 AsciiReader::AsciiReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
+{
     paused = false;
     discardFirstLine = true;
     sampleCount = 0;
     _numOfChannels = _settingsWidget.numOfChannels();
     autoNumOfChannels = (_numOfChannels == NUMOFCHANNELS_AUTO);
     connect(&_settingsWidget, &AsciiReaderSettings::numOfChannelsChanged,
             [this](unsigned value)
+            {
                 _numOfChannels = value;
                 autoNumOfChannels = (_numOfChannels == NUMOFCHANNELS_AUTO);
                 if (!autoNumOfChannels)
+                {
                     emit numOfChannelsChanged(value);
@@ @@ -146,27 +145,25 @@ void AsciiReader::onDataReady() @@
         for (unsigned ci = 0; ci < numReadChannels; ci++)
+        {
             bool ok;
             channelSamples[ci] = separatedValues[ci].toDouble(&ok);
             if (!ok)
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
                 channelSamples[ci] = 0;
+            }
+        }
         // commit data
         _channelMan->addData(channelSamples, _numOfChannels);
         sampleCount += numReadChannels;
         emit dataAdded();
         addData(channelSamples, _numOfChannels);
         delete[] channelSamples;
+    }
+}
 void AsciiReader::saveSettings(QSettings* settings)
+{
     _settingsWidget.saveSettings(settings);
+}
 void AsciiReader::loadSettings(QSettings* settings)
+{

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -20,25 +20,24 @@ @@
 #include <QtEndian>
 #include <QtDebug>
 #include "binarystreamreader.h"
 #include "floatswap.h"
 BinaryStreamReader::BinaryStreamReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
+{
     paused = false;
     skipByteRequested = false;
     skipSampleRequested = false;
     sampleCount = 0;
     _numOfChannels = _settingsWidget.numOfChannels();
     connect(&_settingsWidget, &BinaryStreamReaderSettings::numOfChannelsChanged,
             this, &BinaryStreamReader::numOfChannelsChanged);
     connect(&_settingsWidget, &BinaryStreamReaderSettings::numOfChannelsChanged,
             this, &BinaryStreamReader::onNumOfChannelsChanged);
     // initial number format selection
     onNumberFormatChanged(_settingsWidget.numberFormat());
     connect(&_settingsWidget, &BinaryStreamReaderSettings::numberFormatChanged,
             this, &BinaryStreamReader::onNumberFormatChanged);
@@ @@ -162,27 +161,25 @@ void BinaryStreamReader::onDataReady() @@
     double* channelSamples = new double[numOfPackagesToRead*_numOfChannels];
     for (int i = 0; i < numOfPackagesToRead; i++)
+    {
         for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+        {
             // channelSamples[ci].replace(i, (this->*readSample)());
             channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
+        }
+    }
     _channelMan->addData(channelSamples, numOfPackagesToRead*_numOfChannels);
     sampleCount += numOfPackagesToRead*_numOfChannels;
     emit dataAdded();
     addData(channelSamples, numOfPackagesToRead*_numOfChannels);
     delete[] channelSamples;
+}
 template<typename T> double BinaryStreamReader::readSampleAs()
+{
     T data;
     _device->read((char*) &data, sizeof(data));
     if (_settingsWidget.endianness() == LittleEndian)
+    {

src/demoreader.cpp

➞

Show inline comments

@@ @@ -72,19 +72,17 @@ void DemoReader::demoTimerTimeout() @@
+{
     const double period = 100;
     count++;
     if (count >= 100) count = 0;
     if (!paused)
+    {
         double* samples = new double[_numOfChannels];
         for (unsigned ci = 0; ci < _numOfChannels; ci++)
+        {
             // we are calculating the fourier components of square wave
             samples[ci] = 4*sin(2*M_PI*double((ci+1)*count)/period)/((2*(ci+1))*M_PI);
             sampleCount++;
+        }
-        _channelMan->addData(samples, _numOfChannels);
         addData(samples, _numOfChannels);
         delete[] samples;
         emit dataAdded();
+    }
+}

src/framedreader.cpp

➞

Show inline comments

@@ @@ -301,26 +301,25 @@ void FramedReader::readFrameDataAndCheck @@
     unsigned rChecksum = 0;
     bool checksumPassed = false;
     if (checksumEnabled)
+    {
         _device->read((char*) &rChecksum, 1);
         calcChecksum &= 0xFF;
         checksumPassed = (calcChecksum == rChecksum);
+    }
     if (!checksumEnabled || checksumPassed)
+    {
         // commit data
         _channelMan->addData(channelSamples, numOfPackagesToRead * _numOfChannels);
         emit dataAdded();
         addData(channelSamples, numOfPackagesToRead*_numOfChannels);
+    }
     else
+    {
         qCritical() << "Checksum failed! Received:" << rChecksum << "Calculated:" << calcChecksum;
+    }
     delete[] channelSamples;
+}
 template<typename T> double FramedReader::readSampleAs()
+{
     T data;

0 comments (0 inline, 0 general)