tempo-plotter Changeset - dcd6029a3bce · protofusion repositories

Changeset - dcd6029a3bce

Parent rev.

Child rev.

[Not reviewed]

new-reader

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-05-29 13:24:14
hy@ozderya.net

renamed checksumEnabled function

3 files changed with 3 insertions and 3 deletions:

src/framedreader.cpp

src/framedreadersettings.cpp

src/framedreadersettings.h

0 comments (0 inline, 0 general)

src/framedreader.cpp

➞

Show inline comments

 /*
   Copyright © 2016 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   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;
     frameSize = _settingsWidget.frameSize();
     syncWord = _settingsWidget.syncWord();
-    checksumEnabled = _settingsWidget.checksumEnabled();
+    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)
+{
     if (enabled)
+    {
         // TODO
         // QObject::connect(_device, &QIODevice::readyRead,
                          // this, &BinaryStreamReader::onDataReady);
+    }
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
+    }
+}
 QWidget* FramedReader::settingsWidget()
+{
     return &_settingsWidget;
+}
 unsigned FramedReader::numOfChannels()
+{
     return _numOfChannels;
+}
 void FramedReader::pause(bool enabled)
+{
     paused = enabled;
+}
 void FramedReader::onNumberFormatChanged(NumberFormat numberFormat)
+{
     switch(numberFormat)
+    {
         case NumberFormat_uint8:
             sampleSize = 1;
             readSample = &FramedReader::readSampleAs<quint8>;
             break;
         case NumberFormat_int8:
             sampleSize = 1;
             readSample = &FramedReader::readSampleAs<qint8>;
             break;
         case NumberFormat_uint16:
             sampleSize = 2;
             readSample = &FramedReader::readSampleAs<quint16>;
             break;
         case NumberFormat_int16:
             sampleSize = 2;
             readSample = &FramedReader::readSampleAs<qint16>;
             break;
         case NumberFormat_uint32:
             sampleSize = 4;
             readSample = &FramedReader::readSampleAs<quint32>;
             break;
         case NumberFormat_int32:
             sampleSize = 4;
             readSample = &FramedReader::readSampleAs<qint32>;
             break;
         case NumberFormat_float:
             sampleSize = 4;
             readSample = &FramedReader::readSampleAs<float>;
             break;
+    }
     checkSettings();
+}
 template<typename T> double FramedReader::readSampleAs()
+{
     T data;
     _device->read((char*) &data, sizeof(data));
     // TODO: checksum
     if (_settingsWidget.endianness() == LittleEndian)
+    {
         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)
+    {
         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;
+    }
     else
+    {
         hasFrameByte = false;
         frameSize = value;
+    }
     checkSettings();
+}

src/framedreadersettings.cpp

➞

Show inline comments

 /*
   Copyright © 2016 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   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 "utils.h"
 #include "framedreadersettings.h"
 #include "ui_framedreadersettings.h"
 FramedReaderSettings::FramedReaderSettings(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::FramedReaderSettings)
+{
     ui->setupUi(this);
     ui->leSyncWord->setMode(false); // hex mode
     connect(ui->cbChecksum, &QCheckBox::toggled,
             [this](bool enabled)
+            {
                 emit checksumChanged(enabled);
             });
     connect(ui->rbFixedSize, &QRadioButton::toggled,
             ui->spSize, &QWidget::setEnabled);
     connect(ui->rbFixedSize, &QRadioButton::toggled,
             [this](bool checked)
+            {
                 emit frameSizeChanged(frameSize());
             });
     // Note: if directly connected we get a runtime warning on incompatible signal arguments
     connect(ui->spSize, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
             [this](int value)
+            {
                 emit frameSizeChanged(value);
             });
     connect(ui->spNumOfChannels, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
             [this](int value)
+            {
                 emit numOfChannelsChanged(value);
             });
     connect(ui->leSyncWord, &QLineEdit::textChanged,
             this, &FramedReaderSettings::onSyncWordEdited);
     connect(ui->nfBox, SIGNAL(selectionChanged(NumberFormat)),
             this, SIGNAL(numberFormatChanged(NumberFormat)));
+}
 FramedReaderSettings::~FramedReaderSettings()
+{
     delete ui;
+}
 void FramedReaderSettings::showMessage(QString message, bool error)
+{
     ui->lMessage->setText(message);
     if (error)
+    {
         ui->lMessage->setStyleSheet("color: red;");
+    }
     else
+    {
         ui->lMessage->setStyleSheet("");
+    }
+}
 unsigned FramedReaderSettings::numOfChannels()
+{
     return ui->spNumOfChannels->value();
+}
 NumberFormat FramedReaderSettings::numberFormat()
+{
     return ui->nfBox->currentSelection();
+}
 Endianness FramedReaderSettings::endianness()
+{
     return ui->endiBox->currentSelection();
+}
 QByteArray FramedReaderSettings::syncWord()
+{
     QString text = ui->leSyncWord->text().remove(' ');
     // check if nibble is missing
     if (text.size() % 2 == 1)
+    {
         // TODO: remove this warning
         return QByteArray();
+    }
     else
+    {
         return QByteArray::fromHex(text.toLatin1());
+    }
+}
 void FramedReaderSettings::onSyncWordEdited()
+{
     // TODO: emit with a delay so that error message doesn't flash!
     emit syncWordChanged(syncWord());
+}
 unsigned FramedReaderSettings::frameSize()
+{
     if (ui->rbFixedSize->isChecked())
+    {
         return ui->spSize->value();
+    }
     else
+    {
         return 0; // frame byte is enabled
+    }
+}
-bool FramedReaderSettings::checksumEnabled()
+bool FramedReaderSettings::isChecksumEnabled()
+{
     return ui->cbChecksum->isChecked();
+}

src/framedreadersettings.h

➞

Show inline comments

 /*
   Copyright © 2016 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   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/>.
 */
 #ifndef FRAMEDREADERSETTINGS_H
 #define FRAMEDREADERSETTINGS_H
 #include <QWidget>
 #include <QByteArray>
 #include "numberformatbox.h"
 #include "endiannessbox.h"
 namespace Ui {
 class FramedReaderSettings;
+}
 class FramedReaderSettings : public QWidget
+{
     Q_OBJECT
 public:
     explicit FramedReaderSettings(QWidget *parent = 0);
     ~FramedReaderSettings();
     void showMessage(QString message, bool error = false);
     unsigned numOfChannels();
     NumberFormat numberFormat();
     Endianness endianness();
     QByteArray syncWord();
     unsigned frameSize(); /// If frame bye is enabled `0` is returned
-    bool checksumEnabled();
+    bool isChecksumEnabled();
 signals:
     /// If sync word is invalid (empty or 1 nibble missing at the end)
     /// signaled with an empty array
     void syncWordChanged(QByteArray);
     /// `0` indicates frame size byte is enabled
     void frameSizeChanged(unsigned);
     void checksumChanged(bool);
     void numOfChannelsChanged(unsigned);
     void numberFormatChanged(NumberFormat);
 private:
     Ui::FramedReaderSettings *ui;
 private slots:
     void onSyncWordEdited();
 };
 #endif // FRAMEDREADERSETTINGS_H

0 comments (0 inline, 0 general)