tempo-plotter Changeset - 233fe22d52af · protofusion repositories

Changeset - 233fe22d52af

Parent rev.

Child rev.

[Not reviewed]

reader-stat

0 10 0

Hasan Yavuz ÖZDERYA - 7 years ago 2019-01-17 16:10:52
hy@ozderya.net

implemented byte counting, not integrated or tested

10 files changed with 83 insertions and 41 deletions:

src/abstractreader.cpp

src/abstractreader.h

src/asciireader.cpp

src/asciireader.h

src/binarystreamreader.cpp

src/binarystreamreader.h

src/demoreader.cpp

src/demoreader.h

src/framedreader.cpp

src/framedreader.h

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -20,12 +20,13 @@ @@
 #include "abstractreader.h"
 AbstractReader::AbstractReader(QIODevice* device, QObject* parent) :
     QObject(parent)
+{
     _device = device;
     numBytesRead = 0;
+}
 void AbstractReader::pause(bool enabled)
+{
     paused = enabled;
+}
@@ @@ -40,6 +41,11 @@ void AbstractReader::enable(bool enabled @@
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}
 void AbstractReader::onDataReady()
+{
     numBytesRead += readData();
+}

src/abstractreader.h

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -60,15 +60,28 @@ public slots: @@
      * Reader should actually continue reading to keep the
      * synchronization but shouldn't commit data.
      */
     void pause(bool enabled);
 protected:
     /// Reader should read from this device in `readData()` function.
     QIODevice* _device;
     /// Reader should check this variable to determine if reading is
     /// paused in `readData()`
     bool paused;
 protected slots:
     /// all derived readers has to override this function
     virtual void onDataReady() = 0;
     /**
      * Called when `readyRead` is signaled by the device. This is
      * where the implementors should read the data and return the
      * exact number of bytes read from the device.
      */
     virtual unsigned readData() = 0;
 private:
     unsigned numBytesRead;
 private slots:
     void onDataReady();
 };
 #endif // ABSTRACTREADER_H

src/asciireader.cpp

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -67,27 +67,26 @@ unsigned AsciiReader::numChannels() cons @@
 void AsciiReader::enable(bool enabled)
+{
     if (enabled)
+    {
         firstReadAfterEnable = true;
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &AsciiReader::onDataReady);
+    }
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
     AbstractReader::enable(enabled);
+}
-void AsciiReader::onDataReady()
+unsigned AsciiReader::readData()
+{
     unsigned numBytesRead = 0;
     while(_device->canReadLine())
+    {
         QString line = QString(_device->readLine());
         QByteArray bytes = _device->readLine();
         QString line = QString(bytes);
         numBytesRead += bytes.size();
         // discard only once when we just started reading
         if (firstReadAfterEnable)
+        {
             firstReadAfterEnable = false;
             continue;
@@ @@ -126,12 +125,14 @@ void AsciiReader::onDataReady() @@
             Q_ASSERT(samples->numChannels() == _numChannels);
             // commit data
             feedOut(*samples);
+        }
+    }
     return numBytesRead;
+}
 SamplePack* AsciiReader::parseLine(const QString& line) const
+{
     auto separatedValues = line.split(delimiter, QString::SkipEmptyParts);
     unsigned numComingChannels = separatedValues.length();

src/asciireader.h

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -47,14 +47,16 @@ private: @@
     /// number of channels will be determined from incoming data
     unsigned autoNumOfChannels;
     QChar delimiter; ///< selected column delimiter
     bool firstReadAfterEnable = false;
     unsigned readData() override;
 private slots:
-    void onDataReady() override;
     /**
      * Parses given line and returns sample pack.
+     *
      * Returns `nullptr` in case of error.
      */
     SamplePack* parseLine(const QString& line) const;

src/binarystreamreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -104,56 +104,64 @@ void BinaryStreamReader::onNumOfChannels @@
+{
     _numChannels = value;
     updateNumChannels();
     emit numOfChannelsChanged(value);
+}
-void BinaryStreamReader::onDataReady()
+unsigned BinaryStreamReader::readData()
+{
     // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
     int packageSize = sampleSize * _numChannels;
     int bytesAvailable = _device->bytesAvailable();
     unsigned packageSize = sampleSize * _numChannels;
     unsigned bytesAvailable = _device->bytesAvailable();
     unsigned totalRead = 0;
     // skip 1 byte if requested
     if (skipByteRequested && bytesAvailable > 0)
+    {
         _device->read(1);
         totalRead++;
         skipByteRequested = false;
         bytesAvailable--;
+    }
     // skip 1 sample (channel) if requested
-    if (skipSampleRequested && bytesAvailable >= (int) sampleSize)
     if (skipSampleRequested && bytesAvailable >= sampleSize)
+    {
         _device->read(sampleSize);
         totalRead += sampleSize;
         skipSampleRequested = false;
         bytesAvailable -= sampleSize;
+    }
     if (bytesAvailable < packageSize) return;
+    if (bytesAvailable < packageSize) return totalRead;
-    int numOfPackagesToRead =
+    unsigned numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     unsigned numBytesToRead = numOfPackagesToRead * packageSize;
     totalRead += numBytesToRead;
     if (paused)
+    {
         // read and discard data
         _device->read(numOfPackagesToRead*packageSize);
         return;
         _device->read(numBytesToRead);
         return totalRead;
+    }
     // actual reading
     SamplePack samples(numOfPackagesToRead, _numChannels);
-    for (int i = 0; i < numOfPackagesToRead; i++)
+    for (unsigned i = 0; i < numOfPackagesToRead; i++)
+    {
-        for (unsigned int ci = 0; ci < _numChannels; ci++)
         for (unsigned ci = 0; ci < _numChannels; ci++)
+        {
             samples.data(ci)[i] = (this->*readSample)();
+        }
+    }
     feedOut(samples);
     return totalRead;
+}
 template<typename T> double BinaryStreamReader::readSampleAs()
+{
     T data;

src/binarystreamreader.h

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -57,13 +57,14 @@ private: @@
+     *
      * @note Device should already have enough bytes present before
      * calling this function.
      */
     template<typename T> double readSampleAs();
     unsigned readData() override;
 private slots:
     void onNumberFormatChanged(NumberFormat numberFormat);
     void onNumOfChannelsChanged(unsigned value);
     void onDataReady() override;
 };
 #endif // BINARYSTREAMREADER_H

src/demoreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -50,14 +50,15 @@ void DemoReader::enable(bool enabled) @@
+    {
         timer.start();
+    }
     else
+    {
         timer.stop();
         disconnectSinks();
+    }
     AbstractReader::enable(enabled);
+}
 unsigned DemoReader::numChannels() const
+{
     return _numChannels;
+}
@@ @@ -88,10 +89,11 @@ void DemoReader::demoTimerTimeout() @@
 void DemoReader::onNumChannelsChanged(unsigned value)
+{
     _numChannels = value;
     updateNumChannels();
+}
-void DemoReader::onDataReady()
+unsigned DemoReader::readData()
+{
     // intentionally empty, required by AbstractReader
     return 0;
+}

src/demoreader.h

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -52,13 +52,14 @@ private: @@
     DemoReaderSettings _settingsWidget;
     unsigned _numChannels;
     QTimer timer;
     int count;
     unsigned readData() override;
 private slots:
     void demoTimerTimeout();
     void onNumChannelsChanged(unsigned value);
     void onDataReady() override;
 };
 #endif // DEMOREADER_H

src/framedreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -181,24 +181,27 @@ void FramedReader::onFrameSizeChanged(un @@
         frameSize = value;
+    }
     checkSettings();
     reset();
+}
-void FramedReader::onDataReady()
+unsigned FramedReader::readData()
+{
     if (settingsInvalid) return;
     unsigned numBytesRead = 0;
     if (settingsInvalid) return numBytesRead;
     // loop until we run out of bytes or more bytes is required
     unsigned bytesAvailable;
     while ((bytesAvailable = _device->bytesAvailable()))
+    {
         if (!gotSync) // read sync word
+        {
             char c;
             _device->getChar(&c);
             numBytesRead++;
             if (c == syncWord[sync_i]) // correct sync byte?
+            {
                 sync_i++;
                 if (sync_i == (unsigned) syncWord.length())
+                {
                     gotSync = true;
@@ @@ -210,12 +213,13 @@ void FramedReader::onDataReady() @@
+            }
+        }
         else if (hasSizeByte && !gotSize) // skipped if fixed frame size
+        {
             frameSize = 0;
             _device->getChar((char*) &frameSize);
             numBytesRead++;
             if (frameSize == 0) // check size
+            {
                 qCritical() << "Frame size is 0!";
                 reset();
+            }
@@ @@ -239,16 +243,19 @@ void FramedReader::onDataReady() @@
+            {
                 break;
+            }
             else // read data bytes and checksum
+            {
                 readFrameDataAndCheck();
                 numBytesRead += checksumEnabled ? frameSize+1 : frameSize;
                 reset();
+            }
+        }
+    }
     return numBytesRead;
+}
 void FramedReader::reset()
+{
     sync_i = 0;
     gotSync = false;
@@ @@ -260,13 +267,13 @@ void FramedReader::reset() @@
 // Important: this function assumes device has enough bytes to read a full frames data and checksum
 void FramedReader::readFrameDataAndCheck()
+{
     // if paused just read and waste data
     if (paused)
+    {
-        _device->read((checksumEnabled ? frameSize+1 : frameSize));
         _device->read(checksumEnabled ? frameSize+1 : frameSize);
         return;
+    }
     // a package is 1 set of samples for all channels
     unsigned numOfPackagesToRead = frameSize / (_numChannels * sampleSize);
     SamplePack samples(numOfPackagesToRead, _numChannels);

src/framedreader.h

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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
@@ @@ -76,14 +76,15 @@ private: @@
     double (FramedReader::*readSample)();
     template<typename T> double readSampleAs();
     /// reads payload portion of the frame, calculates checksum and commits data
     /// @note should be called only if there are enough bytes on device
     void readFrameDataAndCheck();
     unsigned readData() override;
 private slots:
     void onDataReady() override;
     void onNumberFormatChanged(NumberFormat numberFormat);
     void onNumOfChannelsChanged(unsigned value);
     void onSyncWordChanged(QByteArray);
     void onFrameSizeChanged(unsigned);
 };

0 comments (0 inline, 0 general)