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

@@ @@ -29,3 +29,10 @@ 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

@@ @@ -49,6 +49,8 @@ public: @@
     /// 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);
@@ @@ -65,6 +67,7 @@ public slots: @@
 protected:
     QIODevice* _device;
     bool paused;
     unsigned _numChannels;
 };
 #endif // ABSTRACTREADER_H

src/asciireader.cpp

➞

Show inline comments

@@ @@ -61,13 +61,6 @@ 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)
+{

src/asciireader.h

➞

Show inline comments

@@ @@ -32,7 +32,6 @@ class AsciiReader : public AbstractReade @@
 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);
@@ @@ -41,7 +40,6 @@ public: @@
 private:
     AsciiReaderSettings _settingsWidget;
     unsigned _numChannels;
     /// number of channels will be determined from incoming data
     unsigned autoNumOfChannels;
     QChar delimiter; ///< selected column delimiter

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -57,11 +57,6 @@ QWidget* BinaryStreamReader::settingsWid @@
     return &_settingsWidget;
+}
 unsigned BinaryStreamReader::numChannels() const
+{
     return _numChannels;
+}
 void BinaryStreamReader::enable(bool enabled)
+{
     if (enabled)

src/binarystreamreader.h

➞

Show inline comments

@@ @@ -36,7 +36,6 @@ class BinaryStreamReader : public Abstra @@
 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);
@@ @@ -45,7 +44,6 @@ public: @@
 private:
     BinaryStreamReaderSettings _settingsWidget;
     unsigned _numChannels;
     unsigned sampleSize;
     bool skipByteRequested;
     bool skipSampleRequested;

src/demoreader.cpp

➞

Show inline comments

@@ @@ -57,11 +57,6 @@ void DemoReader::enable(bool enabled) @@
+    }
+}
 unsigned DemoReader::numChannels() const
+{
     return _numChannels;
+}
 void DemoReader::setNumChannels(unsigned value)
+{
     _settingsWidget.setNumChannels(value);

src/demoreader.h

➞

Show inline comments

@@ @@ -42,7 +42,6 @@ public: @@
     explicit DemoReader(QIODevice* device, QObject* parent = 0);
     QWidget* settingsWidget();
     unsigned numChannels() const;
     void enable(bool enabled = true);
 public slots:
@@ @@ -51,7 +50,6 @@ public slots: @@
 private:
     DemoReaderSettings _settingsWidget;
     unsigned _numChannels;
     QTimer timer;
     int count;

src/framedreader.cpp

➞

Show inline comments

@@ @@ -81,11 +81,6 @@ QWidget* FramedReader::settingsWidget() @@
     return &_settingsWidget;
+}
 unsigned FramedReader::numChannels() const
+{
     return _numChannels;
+}
 void FramedReader::onNumberFormatChanged(NumberFormat numberFormat)
+{
     switch(numberFormat)

src/framedreader.h

➞

Show inline comments

@@ @@ -35,7 +35,6 @@ class FramedReader : public AbstractRead @@
 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);
@@ @@ -52,7 +51,6 @@ private: @@
     // 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;

0 comments (0 inline, 0 general)