tempo-plotter Changeset - 81a003dc29e2 · protofusion repositories

Changeset - 81a003dc29e2

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

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

AbstractReader should only implement generic enable function.

4 files changed with 20 insertions and 4 deletions:

src/abstractreader.cpp

src/abstractreader.h

src/asciireader.cpp

src/asciireader.h

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

@@ @@ -41,13 +41,11 @@ 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

@@ @@ -44,7 +44,7 @@ public: @@
     /// Reader should only read when enabled. Default state should be
     /// 'disabled'.
     void enable(bool enabled = true);
+    virtual void enable(bool enabled = true);
     /// None of the current readers support X channel at the moment
     bool hasX() const final { return false; };
@@ @@ -68,7 +68,6 @@ protected: @@
     QIODevice* _device;
     bool paused;
     unsigned _numChannels;
     bool firstReadAfterEnable = false;
 protected slots:
     /// all derived readers has to override this function

src/asciireader.cpp

➞

Show inline comments

@@ @@ -58,6 +58,22 @@ QWidget* AsciiReader::settingsWidget() @@
     return &_settingsWidget;
+}
 void AsciiReader::enable(bool enabled)
+{
     if (enabled)
+    {
         firstReadAfterEnable = true;
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &AsciiReader::onDataReady);
+    }
     else
+    {
         firstReadAfterEnable = false;
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}
 void AsciiReader::onDataReady()
+{
     while(_device->canReadLine())

src/asciireader.h

➞

Show inline comments

@@ @@ -32,6 +32,7 @@ class AsciiReader : public AbstractReade @@
 public:
     explicit AsciiReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
     void enable(bool enabled);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
@@ @@ -43,6 +44,8 @@ private: @@
     unsigned autoNumOfChannels;
     QChar delimiter; ///< selected column delimiter
     bool firstReadAfterEnable = false;
 private slots:
     void onDataReady() override;
 };

0 comments (0 inline, 0 general)