tempo-plotter Changeset - 65256d18c617 · protofusion repositories

Changeset - 65256d18c617

Parent rev.

Child rev.

[Not reviewed]

default

0 10 0

Mehmet ASLAN - 7 years ago 2018-06-24 02:48:40
aaslan.mehmet@hotmail.com

enable common in all readers, abstracted

10 files changed with 33 insertions and 60 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

@@ @@ -33,6 +33,22 @@ void AbstractReader::pause(bool enabled) @@
 unsigned AbstractReader::numChannels() const
+{
     // TODO: an alternative is to never set _numChannels to '0'
     // do not allow '0'
     return _numChannels == 0 ? 1 : _numChannels;
+}
 void AbstractReader::enable(bool enabled)
+{
     if (enabled)
+    {
         firstReadAfterEnable = true;
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &AbstractReader::onDataReady);
+    }
     else
+    {
         firstReadAfterEnable = false;
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}

src/abstractreader.h

➞

Show inline comments

@@ @@ -41,13 +41,13 @@ public: @@
      * is selected.
      */
     virtual QWidget* settingsWidget() = 0;
     /// Reader should only read when enabled. Default state should be
     /// 'disabled'.
-    virtual void enable(bool enabled = true) = 0;
     void enable(bool enabled = true);
     /// None of the current readers support X channel at the moment
     bool hasX() const final { return false; };
     unsigned numChannels() const;
@@ @@ -65,9 +65,14 @@ public slots: @@
     void pause(bool enabled);
 protected:
     QIODevice* _device;
     bool paused;
     unsigned _numChannels;
     bool firstReadAfterEnable = false;
 protected slots:
     /// all derived readers has to override this function
     virtual void onDataReady() = 0;
 };
 #endif // ABSTRACTREADER_H

src/asciireader.cpp

➞

Show inline comments

@@ @@ -25,13 +25,12 @@ @@
 #define NUMOFCHANNELS_AUTO   (0)
 AsciiReader::AsciiReader(QIODevice* device, QObject* parent) :
     AbstractReader(device, parent)
+{
     paused = false;
     discardFirstLine = true;
     _numChannels = _settingsWidget.numOfChannels();
     autoNumOfChannels = (_numChannels == NUMOFCHANNELS_AUTO);
     delimiter = _settingsWidget.delimiter();
     connect(&_settingsWidget, &AsciiReaderSettings::numOfChannelsChanged,
@@ @@ -49,47 +48,29 @@ AsciiReader::AsciiReader(QIODevice* devi @@
     connect(&_settingsWidget, &AsciiReaderSettings::delimiterChanged,
             [this](QChar d)
+            {
                 delimiter = d;
             });
     connect(device, &QIODevice::aboutToClose, [this](){discardFirstLine=true;});
+}
 QWidget* AsciiReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 // TODO: this could be a part of AbstractReader
 void AsciiReader::enable(bool enabled)
+{
     if (enabled)
+    {
         discardFirstLine = true;
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &AsciiReader::onDataReady);
+    }
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}
 void AsciiReader::onDataReady()
+{
     while(_device->canReadLine())
+    {
         QString line = QString(_device->readLine());
         // discard only once when we just started reading
-        if (discardFirstLine)
+        if (firstReadAfterEnable)
+        {
-            discardFirstLine = false;
+            firstReadAfterEnable = false;
             continue;
+        }
         // discard data if paused
         if (paused)
+        {

src/asciireader.h

➞

Show inline comments

@@ @@ -29,27 +29,22 @@ class AsciiReader : public AbstractReade @@
+{
     Q_OBJECT
 public:
     explicit AsciiReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 private:
     AsciiReaderSettings _settingsWidget;
     /// number of channels will be determined from incoming data
     unsigned autoNumOfChannels;
     QChar delimiter; ///< selected column delimiter
     // We may have (usually true) started reading in the middle of a
     // line, so its a better idea to just discard first line.
     bool discardFirstLine;
 private slots:
     void onDataReady();
+    void onDataReady() override;
 };
 #endif // ASCIIREADER_H

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -54,26 +54,12 @@ BinaryStreamReader::BinaryStreamReader(Q @@
 QWidget* BinaryStreamReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 void BinaryStreamReader::enable(bool enabled)
+{
     if (enabled)
+    {
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &BinaryStreamReader::onDataReady);
+    }
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}
 void BinaryStreamReader::onNumberFormatChanged(NumberFormat numberFormat)
+{
     switch(numberFormat)
+    {
         case NumberFormat_uint8:
             sampleSize = 1;

src/binarystreamreader.h

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ @@
 class BinaryStreamReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit BinaryStreamReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 private:
@@ @@ -59,10 +58,10 @@ private: @@
      */
     template<typename T> double readSampleAs();
 private slots:
     void onNumberFormatChanged(NumberFormat numberFormat);
     void onNumOfChannelsChanged(unsigned value);
     void onDataReady();
+    void onDataReady() override;
 };
 #endif // BINARYSTREAMREADER_H

src/demoreader.cpp

➞

Show inline comments

@@ @@ -82,6 +82,11 @@ void DemoReader::demoTimerTimeout() @@
 void DemoReader::onNumChannelsChanged(unsigned value)
+{
     _numChannels = value;
     updateNumChannels();
+}
 void DemoReader::onDataReady()
+{
     // intentionally empty, required by AbstractReader
+}

src/demoreader.h

➞

Show inline comments

@@ @@ -53,9 +53,10 @@ private: @@
     QTimer timer;
     int count;
 private slots:
     void demoTimerTimeout();
     void onNumChannelsChanged(unsigned value);
     void onDataReady() override;
 };
 #endif // DEMOREADER_H

src/framedreader.cpp

➞

Show inline comments

@@ @@ -59,26 +59,12 @@ FramedReader::FramedReader(QIODevice* de @@
             [this](bool enabled){debugModeEnabled = enabled;});
     // init reader state
     reset();
+}
 void FramedReader::enable(bool enabled)
+{
     if (enabled)
+    {
         connect(_device, &QIODevice::readyRead,
                 this, &FramedReader::onDataReady);
+    }
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}
 QWidget* FramedReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 void FramedReader::onNumberFormatChanged(NumberFormat numberFormat)

src/framedreader.h

➞

Show inline comments

@@ @@ -32,13 +32,12 @@ class FramedReader : public AbstractRead @@
+{
     Q_OBJECT
 public:
     explicit FramedReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 private:
@@ @@ -76,13 +75,13 @@ private: @@
     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();
 private slots:
     void onDataReady();
+    void onDataReady() override;
     void onNumberFormatChanged(NumberFormat numberFormat);
     void onNumOfChannelsChanged(unsigned value);
     void onSyncWordChanged(QByteArray);
     void onFrameSizeChanged(unsigned);
 };

0 comments (0 inline, 0 general)