tempo-plotter Changeset - 0267a37438e6 · protofusion repositories

Changeset - 0267a37438e6

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Hasan Yavuz ÖZDERYA - 7 years ago 2019-01-13 13:57:07
hy@ozderya.net

increased maximum number of channels to 64

5 files changed with 25 insertions and 6 deletions:

src/asciireadersettings.cpp

src/binarystreamreadersettings.cpp

src/defines.h

src/demoreadersettings.cpp

src/framedreadersettings.cpp

0 comments (0 inline, 0 general)

src/asciireadersettings.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2019 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 <QRegularExpressionValidator>
 #include <QRegularExpression>
 #include "utils.h"
 #include "defines.h"
 #include "setting_defines.h"
 #include "asciireadersettings.h"
 #include "ui_asciireadersettings.h"
 AsciiReaderSettings::AsciiReaderSettings(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::AsciiReaderSettings)
+{
     ui->setupUi(this);
     auto validator = new QRegularExpressionValidator(QRegularExpression("[^\\d]?"), this);
     ui->leDelimiter->setValidator(validator);
     ui->spNumOfChannels->setMaximum(MAX_NUM_CHANNELS);
     connect(ui->rbComma, &QAbstractButton::toggled,
             this, &AsciiReaderSettings::delimiterToggled);
     connect(ui->rbSpace, &QAbstractButton::toggled,
             this, &AsciiReaderSettings::delimiterToggled);
     connect(ui->rbTab, &QAbstractButton::toggled,
             this, &AsciiReaderSettings::delimiterToggled);
     connect(ui->rbOtherDelimiter, &QAbstractButton::toggled,
             this, &AsciiReaderSettings::delimiterToggled);
     connect(ui->leDelimiter, &QLineEdit::textChanged,
             this, &AsciiReaderSettings::customDelimiterChanged);
     // Note: if directly connected we get a runtime warning on incompatible signal arguments
     connect(ui->spNumOfChannels, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
             [this](int value)
+            {
                 emit numOfChannelsChanged(value);
             });
+}
 AsciiReaderSettings::~AsciiReaderSettings()
+{
     delete ui;
+}
 unsigned AsciiReaderSettings::numOfChannels() const
+{
     return ui->spNumOfChannels->value();
+}
 QChar AsciiReaderSettings::delimiter() const
+{
     if (ui->rbComma->isChecked())
+    {
         return QChar(',');
+    }
     else if (ui->rbSpace->isChecked())
+    {
         return QChar(' ');
+    }
     else if (ui->rbTab->isChecked())
+    {
         return QChar('\t');
+    }
     else                        // rbOther
+    {
         auto t = ui->leDelimiter->text();
         return t.isEmpty() ? QChar() : t.at(0);
+    }
+}
 void AsciiReaderSettings::delimiterToggled(bool checked)
+{
     if (!checked) return;
     auto d = delimiter();
     if (!d.isNull())
+    {
         emit delimiterChanged(d);
+    }
+}
 void AsciiReaderSettings::customDelimiterChanged(const QString text)
+{
     if (ui->rbOtherDelimiter->isChecked())
+    {
         if (!text.isEmpty()) emit delimiterChanged(text.at(0));
+    }
+}
 void AsciiReaderSettings::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_ASCII);
     // save number of channels setting
     QString numOfChannelsSetting = QString::number(numOfChannels());
     if (numOfChannelsSetting == "0") numOfChannelsSetting = "auto";
     settings->setValue(SG_ASCII_NumOfChannels, numOfChannelsSetting);
     // save delimiter
     QString delimiterS;
     if (ui->rbOtherDelimiter->isChecked())
+    {
         delimiterS = "other";
+    }
     else if (ui->rbTab->isChecked())
+    {
         // Note: \t is not correctly loaded
         delimiterS = "TAB";
+    }
     else
+    {
         delimiterS = delimiter();
+    }
     settings->setValue(SG_ASCII_Delimiter, delimiterS);
     settings->setValue(SG_ASCII_CustomDelimiter, ui->leDelimiter->text());

src/binarystreamreadersettings.cpp

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2019 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 "binarystreamreadersettings.h"
 #include "ui_binarystreamreadersettings.h"
 #include "utils.h"
 #include "defines.h"
 #include "setting_defines.h"
 BinaryStreamReaderSettings::BinaryStreamReaderSettings(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::BinaryStreamReaderSettings)
+{
     ui->setupUi(this);
     ui->spNumOfChannels->setMaximum(MAX_NUM_CHANNELS);
     // Note: if directly connected we get a runtime warning on incompatible signal arguments
     connect(ui->spNumOfChannels, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
             [this](int value)
+            {
                 emit numOfChannelsChanged(value);
             });
     connect(ui->nfBox, SIGNAL(selectionChanged(NumberFormat)),
             this, SIGNAL(numberFormatChanged(NumberFormat)));
     connect(ui->pbSkipByte, SIGNAL(clicked()), this, SIGNAL(skipByteRequested()));
     connect(ui->pbSkipSample, SIGNAL(clicked()), this, SIGNAL(skipSampleRequested()));
+}
 BinaryStreamReaderSettings::~BinaryStreamReaderSettings()
+{
     delete ui;
+}
 unsigned BinaryStreamReaderSettings::numOfChannels()
+{
     return ui->spNumOfChannels->value();
+}
 NumberFormat BinaryStreamReaderSettings::numberFormat()
+{
     return ui->nfBox->currentSelection();
+}
 Endianness BinaryStreamReaderSettings::endianness()
+{
     return ui->endiBox->currentSelection();
+}
 void BinaryStreamReaderSettings::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Binary);
     settings->setValue(SG_Binary_NumOfChannels, numOfChannels());
     settings->setValue(SG_Binary_NumberFormat, numberFormatToStr(numberFormat()));
     settings->setValue(SG_Binary_Endianness,
                        endianness() == LittleEndian ? "little" : "big");
     settings->endGroup();
+}
 void BinaryStreamReaderSettings::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Binary);
     // load number of channels
     ui->spNumOfChannels->setValue(
         settings->value(SG_Binary_NumOfChannels, numOfChannels()).toInt());
     // load number format
     NumberFormat nfSetting =
         strToNumberFormat(settings->value(SG_Binary_NumberFormat,
                                           QString()).toString());
     if (nfSetting == NumberFormat_INVALID) nfSetting = numberFormat();
     ui->nfBox->setSelection(nfSetting);
     // load endianness
     QString endiannessSetting =
         settings->value(SG_Binary_Endianness, QString()).toString();
     if (endiannessSetting == "little")
+    {
         ui->endiBox->setSelection(LittleEndian);
+    }
     else if (endiannessSetting == "big")
+    {
         ui->endiBox->setSelection(BigEndian);
     } // else don't change
     settings->endGroup();
+}

src/defines.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2019 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/>.
 */
 const char* BUG_REPORT_URL = "https://bitbucket.org/hyOzd/serialplot/issues/new";
 #ifndef DEFINES_H
 #define DEFINES_H
 const char BUG_REPORT_URL[] = "https://bitbucket.org/hyOzd/serialplot/issues/new";
 /// Maximum number of channels that can be set by user
 const unsigned MAX_NUM_CHANNELS = 64;
 #endif  // DEFINES_H

src/demoreadersettings.cpp

➞

Show inline comments

 /*
-  Copyright © 2018 Hasan Yavuz Özderya
+  Copyright © 2019 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 "demoreadersettings.h"
 #include "ui_demoreadersettings.h"
 #include "utils.h"
 #include "defines.h"
 DemoReaderSettings::DemoReaderSettings(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DemoReaderSettings)
+{
     ui->setupUi(this);
     ui->spNumChannels->setMaximum(MAX_NUM_CHANNELS);
     connect(ui->spNumChannels, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
             [this](int value)
+            {
                 emit numChannelsChanged(value);
             });
+}
 DemoReaderSettings::~DemoReaderSettings()
+{
     delete ui;
+}
 unsigned DemoReaderSettings::numChannels() const
+{
     return ui->spNumChannels->value();
+}
 void DemoReaderSettings::setNumChannels(unsigned value)
+{
     ui->spNumChannels->setValue(value);
+}

src/framedreadersettings.cpp

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2019 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 <QButtonGroup>
 #include "utils.h"
 #include "defines.h"
 #include "setting_defines.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
     ui->leSyncWord->setText("AA BB");
     ui->spNumOfChannels->setMaximum(MAX_NUM_CHANNELS);
     connect(ui->cbChecksum, &QCheckBox::toggled,
             [this](bool enabled)
+            {
                 emit checksumChanged(enabled);
             });
     connect(ui->cbDebugMode, &QCheckBox::toggled,
             this, &FramedReaderSettings::debugModeChanged);
     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)));
     // add frame size selection buttons to same group
     QButtonGroup* group = new QButtonGroup(this);
     group->addButton(ui->rbFixedSize);
     group->addButton(ui->rbSizeByte);
+}
 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)
+    {
         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());

0 comments (0 inline, 0 general)