Changeset - 902281c3698d
[Not reviewed]
default
0 10 0
Mehmet ASLAN - 7 years ago 2018-06-24 01:00:31
aaslan.mehmet@hotmail.com
pause common in all readers, abstracted
10 files changed with 7 insertions and 35 deletions:
0 comments (0 inline, 0 general)
src/abstractreader.cpp
Show inline comments
 
@@ -24,3 +24,8 @@ AbstractReader::AbstractReader(QIODevice
 
{
 
    _device = device;
 
}
 

	
 
void AbstractReader::pause(bool enabled)
 
{
 
    paused = enabled;
 
}
src/abstractreader.h
Show inline comments
 
@@ -60,10 +60,11 @@ public slots:
 
     * Reader should actually continue reading to keep the
 
     * synchronization but shouldn't commit data.
 
     */
 
    virtual void pause(bool) = 0;
 
    void pause(bool enabled);
 

	
 
protected:
 
    QIODevice* _device;
 
    bool paused;
 
};
 

	
 
#endif // ABSTRACTREADER_H
src/asciireader.cpp
Show inline comments
 
@@ -84,11 +84,6 @@ void AsciiReader::enable(bool enabled)
 
    }
 
}
 

	
 
void AsciiReader::pause(bool enabled)
 
{
 
    paused = enabled;
 
}
 

	
 
void AsciiReader::onDataReady()
 
{
 
    while(_device->canReadLine())
src/asciireader.h
Show inline comments
 
@@ -39,16 +39,12 @@ public:
 
    /// Loads settings from a `QSettings`.
 
    void loadSettings(QSettings* settings);
 

	
 
public slots:
 
    void pause(bool);
 

	
 
private:
 
    AsciiReaderSettings _settingsWidget;
 
    unsigned _numChannels;
 
    /// number of channels will be determined from incoming data
 
    unsigned autoNumOfChannels;
 
    QChar delimiter; ///< selected column delimiter
 
    bool paused;
 

	
 
    // 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
 
@@ -76,11 +76,6 @@ void BinaryStreamReader::enable(bool ena
 
    }
 
}
 

	
 
void BinaryStreamReader::pause(bool enabled)
 
{
 
    paused = enabled;
 
}
 

	
 
void BinaryStreamReader::onNumberFormatChanged(NumberFormat numberFormat)
 
{
 
    switch(numberFormat)
src/binarystreamreader.h
Show inline comments
 
@@ -43,14 +43,10 @@ public:
 
    /// Loads settings from a `QSettings`.
 
    void loadSettings(QSettings* settings);
 

	
 
public slots:
 
    void pause(bool);
 

	
 
private:
 
    BinaryStreamReaderSettings _settingsWidget;
 
    unsigned _numChannels;
 
    unsigned sampleSize;
 
    bool paused;
 
    bool skipByteRequested;
 
    bool skipSampleRequested;
 

	
src/demoreader.cpp
Show inline comments
 
@@ -67,11 +67,6 @@ void DemoReader::setNumChannels(unsigned
 
    _settingsWidget.setNumChannels(value);
 
}
 

	
 
void DemoReader::pause(bool enabled)
 
{
 
    paused = enabled;
 
}
 

	
 
void DemoReader::demoTimerTimeout()
 
{
 
    const double period = 100;
src/demoreader.h
Show inline comments
 
@@ -46,13 +46,11 @@ public:
 
    void enable(bool enabled = true);
 

	
 
public slots:
 
    void pause(bool);
 
    void setNumChannels(unsigned value);
 

	
 
private:
 
    DemoReaderSettings _settingsWidget;
 

	
 
    bool paused;
 
    unsigned _numChannels;
 
    QTimer timer;
 
    int count;
src/framedreader.cpp
Show inline comments
 
@@ -86,11 +86,6 @@ unsigned FramedReader::numChannels() con
 
    return _numChannels;
 
}
 

	
 
void FramedReader::pause(bool enabled)
 
{
 
    paused = enabled;
 
}
 

	
 
void FramedReader::onNumberFormatChanged(NumberFormat numberFormat)
 
{
 
    switch(numberFormat)
src/framedreader.h
Show inline comments
 
@@ -42,9 +42,6 @@ public:
 
    /// Loads settings from a `QSettings`.
 
    void loadSettings(QSettings* settings);
 

	
 
public slots:
 
    void pause(bool);
 

	
 
private:
 
    /// bit wise fields for `settingsValid` member
 
    enum SettingInvalidFlag
 
@@ -57,7 +54,6 @@ private:
 
    FramedReaderSettings _settingsWidget;
 
    unsigned _numChannels;
 
    unsigned sampleSize;
 
    bool paused;
 
    unsigned settingsInvalid;   /// settings are all valid if this is 0, if not no reading is done
 
    QByteArray syncWord;
 
    bool checksumEnabled;
0 comments (0 inline, 0 general)