tempo-plotter Changeset - 5a2bc927a411 · protofusion repositories

Changeset - 5a2bc927a411

Parent rev.

Child rev.

[Not reviewed]

default

0 10 0

Mehmet ASLAN - 7 years ago 2018-06-24 01:18:14
aaslan.mehmet@hotmail.com

numChannels common in all readers, abstracted

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

@@ @@ -26,6 +26,13 @@ AbstractReader::AbstractReader(QIODevice @@
+}
 void AbstractReader::pause(bool enabled)
+{
     paused = enabled;
+}
 unsigned AbstractReader::numChannels() const
+{
     // TODO: an alternative is to never set _numChannels to '0'
     // do not allow '0'
     return _numChannels == 0 ? 1 : _numChannels;
+}

src/abstractreader.h

➞

Show inline comments

@@ @@ -46,12 +46,14 @@ public: @@
     /// 'disabled'.
     virtual void enable(bool enabled = true) = 0;
     /// None of the current readers support X channel at the moment
     bool hasX() const final { return false; };
     unsigned numChannels() const;
 signals:
     // TODO: should we keep this?
     void numOfChannelsChanged(unsigned);
 public slots:
     /**
@@ @@ -62,9 +64,10 @@ public slots: @@
      */
     void pause(bool enabled);
 protected:
     QIODevice* _device;
     bool paused;
     unsigned _numChannels;
 };
 #endif // ABSTRACTREADER_H

src/asciireader.cpp

➞

Show inline comments

@@ @@ -58,19 +58,12 @@ AsciiReader::AsciiReader(QIODevice* devi @@
 QWidget* AsciiReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 unsigned AsciiReader::numChannels() const
+{
     // TODO: an alternative is to never set _numChannels to '0'
     // do not allow '0'
     return _numChannels == 0 ? 1 : _numChannels;
+}
 // TODO: this could be a part of AbstractReader
 void AsciiReader::enable(bool enabled)
+{
     if (enabled)
+    {
         discardFirstLine = true;

src/asciireader.h

➞

Show inline comments

@@ @@ -29,22 +29,20 @@ class AsciiReader : public AbstractReade @@
+{
     Q_OBJECT
 public:
     explicit AsciiReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numChannels() const;
     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;
     unsigned _numChannels;
     /// 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.

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -54,17 +54,12 @@ BinaryStreamReader::BinaryStreamReader(Q @@
 QWidget* BinaryStreamReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 unsigned BinaryStreamReader::numChannels() const
+{
     return _numChannels;
+}
 void BinaryStreamReader::enable(bool enabled)
+{
     if (enabled)
+    {
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &BinaryStreamReader::onDataReady);

src/binarystreamreader.h

➞

Show inline comments

@@ @@ -33,22 +33,20 @@ @@
 class BinaryStreamReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit BinaryStreamReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numChannels() const;
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 private:
     BinaryStreamReaderSettings _settingsWidget;
     unsigned _numChannels;
     unsigned sampleSize;
     bool skipByteRequested;
     bool skipSampleRequested;
     /// points to the readSampleAs function for currently selected number format
     double (BinaryStreamReader::*readSample)();

src/demoreader.cpp

➞

Show inline comments

@@ @@ -54,17 +54,12 @@ void DemoReader::enable(bool enabled) @@
+    {
         timer.stop();
         disconnectSinks();
+    }
+}
 unsigned DemoReader::numChannels() const
+{
     return _numChannels;
+}
 void DemoReader::setNumChannels(unsigned value)
+{
     _settingsWidget.setNumChannels(value);
+}
 void DemoReader::demoTimerTimeout()

src/demoreader.h

➞

Show inline comments

@@ @@ -39,22 +39,20 @@ class DemoReader : public AbstractReader @@
     Q_OBJECT
 public:
     explicit DemoReader(QIODevice* device, QObject* parent = 0);
     QWidget* settingsWidget();
     unsigned numChannels() const;
     void enable(bool enabled = true);
 public slots:
     void setNumChannels(unsigned value);
 private:
     DemoReaderSettings _settingsWidget;
     unsigned _numChannels;
     QTimer timer;
     int count;
 private slots:
     void demoTimerTimeout();
     void onNumChannelsChanged(unsigned value);

src/framedreader.cpp

➞

Show inline comments

@@ @@ -78,17 +78,12 @@ void FramedReader::enable(bool enabled) @@
 QWidget* FramedReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 unsigned FramedReader::numChannels() const
+{
     return _numChannels;
+}
 void FramedReader::onNumberFormatChanged(NumberFormat numberFormat)
+{
     switch(numberFormat)
+    {
         case NumberFormat_uint8:
             sampleSize = 1;

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();
     unsigned numChannels() const;
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
@@ @@ -49,13 +48,12 @@ private: @@
         SYNCWORD_INVALID = 1,
         FRAMESIZE_INVALID = 2
     };
     // settings related members
     FramedReaderSettings _settingsWidget;
     unsigned _numChannels;
     unsigned sampleSize;
     unsigned settingsInvalid;   /// settings are all valid if this is 0, if not no reading is done
     QByteArray syncWord;
     bool checksumEnabled;
     bool hasSizeByte;
     unsigned frameSize;

0 comments (0 inline, 0 general)