tempo-plotter Changeset - 724d38d30fb1 · protofusion repositories

Changeset - 724d38d30fb1

Parent rev.

Child rev.

[Not reviewed]

new-reader

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-05-29 14:16:30
hy@ozderya.net

renamed hasFrameByte to hasSizeByte

2 files changed with 5 insertions and 5 deletions:

src/framedreader.cpp

src/framedreader.h

0 comments (0 inline, 0 general)

src/framedreader.cpp

➞

Show inline comments

@@ @@ -10,49 +10,49 @@ @@
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QtDebug>
 #include <QtEndian>
 #include "floatswap.h"
 #include "framedreader.h"
 FramedReader::FramedReader(QIODevice* device, ChannelManager* channelMan, QObject *parent) :
     AbstractReader(device, channelMan, parent)
+{
     paused = false;
     // initial settings
     settingsInvalid = 0;
     _numOfChannels = _settingsWidget.numOfChannels();
-    hasFrameByte = _settingsWidget.frameSize() == 0;
+    hasSizeByte = _settingsWidget.frameSize() == 0;
     frameSize = _settingsWidget.frameSize();
     syncWord = _settingsWidget.syncWord();
     checksumEnabled = _settingsWidget.isChecksumEnabled();
     onNumberFormatChanged(_settingsWidget.numberFormat());
     checkSettings();
     connect(&_settingsWidget, &FramedReaderSettings::numberFormatChanged,
             this, &FramedReader::onNumberFormatChanged);
     connect(&_settingsWidget, &FramedReaderSettings::numOfChannelsChanged,
             this, &FramedReader::onNumOfChannelsChanged);
     connect(&_settingsWidget, &FramedReaderSettings::syncWordChanged,
             this, &FramedReader::onSyncWordChanged);
     connect(&_settingsWidget, &FramedReaderSettings::frameSizeChanged,
             this, &FramedReader::onFrameSizeChanged);
     connect(&_settingsWidget, &FramedReaderSettings::checksumChanged,
             [this](bool enabled){checksumEnabled = enabled;});
+}
 void FramedReader::enable(bool enabled)
+{
@@ @@ -132,77 +132,77 @@ template<typename T> double FramedReader @@
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}
 void FramedReader::checkSettings()
+{
     // sync word is invalid (empty or missing a nibble at the end)
     if (!syncWord.size())
+    {
         settingsInvalid |= SYNCWORD_INVALID;
+    }
     else // sync word is valid
+    {
         settingsInvalid &= ~SYNCWORD_INVALID;
+    }
     // check if fixed frame size is multiple of a sample set size
-    if (!hasFrameByte && frameSize % (_numOfChannels * sampleSize) != 0)
+    if (!hasSizeByte && frameSize % (_numOfChannels * sampleSize) != 0)
+    {
         settingsInvalid |= FRAMESIZE_INVALID;
+    }
     else
+    {
         settingsInvalid &= ~FRAMESIZE_INVALID;
+    }
     // show an error message
     if (settingsInvalid & SYNCWORD_INVALID)
+    {
         _settingsWidget.showMessage("Sync word is invalid!", true);
+    }
     else if (settingsInvalid & FRAMESIZE_INVALID)
+    {
         QString errorMessage =
             QString("Frame size must be multiple of %1 (#channels * sample size)!")\
             .arg(_numOfChannels * sampleSize);
         _settingsWidget.showMessage(errorMessage, true);
+    }
     else
+    {
         _settingsWidget.showMessage("All is well!");
+    }
+}
 void FramedReader::onNumOfChannelsChanged(unsigned value)
+{
     _numOfChannels = value;
     checkSettings();
+}
 void FramedReader::onSyncWordChanged(QByteArray word)
+{
     syncWord = word;
     checkSettings();
+}
 void FramedReader::onFrameSizeChanged(unsigned value)
+{
     if (value == 0)
+    {
-        hasFrameByte = true;
+        hasSizeByte = true;
+    }
     else
+    {
-        hasFrameByte = false;
+        hasSizeByte = false;
         frameSize = value;
+    }
     checkSettings();
+}

src/framedreader.h

➞

Show inline comments

@@ @@ -33,49 +33,49 @@ class FramedReader : public AbstractRead @@
 public:
     explicit FramedReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numOfChannels();
     void enable(bool enabled = true);
 public slots:
     void pause(bool);
 private:
     /// bit wise fields for `settingsValid` member
     enum SettingInvalidFlag
+    {
         SYNCWORD_INVALID = 1,
         FRAMESIZE_INVALID = 2
     };
     FramedReaderSettings _settingsWidget;
     unsigned _numOfChannels;
     unsigned sampleSize;
     bool paused;
     unsigned settingsInvalid;   /// settings are all valid if this is 0, if not no reading is done
     QByteArray syncWord;
     bool checksumEnabled;
-    bool hasFrameByte;
+    bool hasSizeByte;
     unsigned frameSize;
     // TODO: create a base class that contains common functionality between binary readers
     /// points to the readSampleAs function for currently selected number format
     double (FramedReader::*readSample)();
     template<typename T> double readSampleAs();
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, double* data, unsigned size);
     /// Checks the validity of syncWord and frameSize then shows an
     /// error message. Also updates `settingsInvalid`. If settings are
     /// valid `settingsInvalid` should be `0`.
     void checkSettings();
 private slots:
     // void onDataReady();
     void onNumberFormatChanged(NumberFormat numberFormat);
     void onNumOfChannelsChanged(unsigned value);
     void onSyncWordChanged(QByteArray);
     void onFrameSizeChanged(unsigned);
 };

0 comments (0 inline, 0 general)