tempo-plotter Changeset - 3da4b5482573 · protofusion repositories

Changeset - 3da4b5482573

Parent rev.

Child rev.

[Not reviewed]

settings

0 11 2

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-04 17:56:19
hy@ozderya.net

implemented settings for simple binary reader

13 files changed with 189 insertions and 14 deletions:

CMakeLists.txt

src/binarystreamreader.cpp

src/binarystreamreader.h

src/binarystreamreadersettings.cpp

src/binarystreamreadersettings.h

src/dataformatpanel.cpp

src/endiannessbox.cpp

src/endiannessbox.h

src/numberformat.cpp

src/numberformat.h

src/numberformatbox.cpp

src/numberformatbox.h

src/setting_defines.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -106,24 +106,25 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   src/framebufferseries.cpp
   src/numberformatbox.cpp
   src/endiannessbox.cpp
   src/abstractreader.cpp
   src/binarystreamreader.cpp
   src/binarystreamreadersettings.cpp
   src/asciireader.cpp
   src/asciireadersettings.cpp
   src/demoreader.cpp
   src/framedreader.cpp
   src/framedreadersettings.cpp
   src/plotmanager.cpp
   src/numberformat.cpp
   misc/windows_icon.rc
   ${UI_FILES}
   ${RES_FILES}
+  )
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
 if (BUILD_QWT)
   add_dependencies(${PROGRAM_NAME} QWT)
 endif (BUILD_QWT)

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -170,37 +170,46 @@ void BinaryStreamReader::onDataReady() @@
     for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+    {
         addChannelData(ci,
                        channelSamples + ci*numOfPackagesToRead,
                        numOfPackagesToRead);
+    }
     emit dataAdded();
     delete channelSamples;
+}
 template<typename T> double BinaryStreamReader::readSampleAs()
+{
     T data;
     _device->read((char*) &data, sizeof(data));
     if (_settingsWidget.endianness() == LittleEndian)
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}
 void BinaryStreamReader::addChannelData(unsigned int channel,
                                         double* data, unsigned size)
+{
     _channelMan->addChannelData(channel, data, size);
     sampleCount += size;
+}
 void BinaryStreamReader::saveSettings(QSettings* settings)
+{
     _settingsWidget.saveSettings(settings);
+}
 void BinaryStreamReader::loadSettings(QSettings* settings)
+{
     _settingsWidget.loadSettings(settings);
+}

src/binarystreamreader.h

➞

Show inline comments

@@ @@ -11,40 +11,46 @@ @@
   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 BINARYSTREAMREADER_H
 #define BINARYSTREAMREADER_H
 #include <QSettings>
 #include "abstractreader.h"
 #include "binarystreamreadersettings.h"
 /**
  * Reads a simple stream of samples in binary form from the
  * device. There is no means of synchronization other than a button
  * that should be manually triggered by user.
  */
 class BinaryStreamReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit BinaryStreamReader(QIODevice* device, ChannelManager* channelMan, QObject *parent = 0);
     QWidget* settingsWidget();
     unsigned numOfChannels();
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     void pause(bool);
 private:
     BinaryStreamReaderSettings _settingsWidget;
     unsigned _numOfChannels;
     unsigned sampleSize;
     bool paused;
     bool skipByteRequested;
     bool skipSampleRequested;

src/binarystreamreadersettings.cpp

➞

Show inline comments

@@ @@ -12,24 +12,25 @@ @@
   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 "setting_defines.h"
 BinaryStreamReaderSettings::BinaryStreamReaderSettings(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::BinaryStreamReaderSettings)
+{
     ui->setupUi(this);
     // 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);
@@ @@ -52,12 +53,52 @@ unsigned BinaryStreamReaderSettings::num @@
     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/binarystreamreadersettings.h

➞

Show inline comments

@@ @@ -12,42 +12,49 @@ @@
   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 BINARYSTREAMREADERSETTINGS_H
 #define BINARYSTREAMREADERSETTINGS_H
 #include <QWidget>
 #include <QSettings>
 #include "numberformatbox.h"
 #include "endiannessbox.h"
 namespace Ui {
 class BinaryStreamReaderSettings;
+}
 class BinaryStreamReaderSettings : public QWidget
+{
     Q_OBJECT
 public:
     explicit BinaryStreamReaderSettings(QWidget *parent = 0);
     ~BinaryStreamReaderSettings();
     unsigned numOfChannels();
     NumberFormat numberFormat();
     Endianness endianness();
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 signals:
     void numOfChannelsChanged(unsigned);
     void numberFormatChanged(NumberFormat);
     void skipByteRequested();
     void skipSampleRequested();
 private:
     Ui::BinaryStreamReaderSettings *ui;
 };
 #endif // BINARYSTREAMREADERSETTINGS_H

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -160,24 +160,27 @@ void DataFormatPanel::saveSettings(QSett @@
+    }
     else if (currentReader == &asciiReader)
+    {
         format = "ascii";
+    }
     else // framed reader
+    {
         format = "custom";
+    }
     settings->setValue(SG_DataFormat_Format, format);
     settings->endGroup();
     // save reader settings
     bsReader.saveSettings(settings);
+}
 void DataFormatPanel::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_DataFormat);
     // load selected format
     QString format = settings->value(
         SG_DataFormat_Format, QString()).toString();
     if (format == "binary")
+    {
@@ @@ -187,13 +190,16 @@ void DataFormatPanel::loadSettings(QSett @@
     else if (format == "ascii")
+    {
         selectReader(&asciiReader);
         ui->rbAscii->setChecked(true);
+    }
     else if (format == "custom")
+    {
         selectReader(&framedReader);
         ui->rbFramed->setChecked(true);
     } // else current selection stays
     settings->endGroup();
     // load reader settings
     bsReader.loadSettings(settings);
+}

src/endiannessbox.cpp

➞

Show inline comments

@@ @@ -39,12 +39,24 @@ EndiannessBox::~EndiannessBox() @@
 Endianness EndiannessBox::currentSelection()
+{
     if (ui->rbLittleE->isChecked())
+    {
         return LittleEndian;
+    }
     else
+    {
         return BigEndian;
+    }
+}
 void EndiannessBox::setSelection(Endianness endianness)
+{
     if (endianness == LittleEndian)
+    {
         ui->rbLittleE->setChecked(true);
+    }
     else // big endian
+    {
         ui->rbBigE->setChecked(true);
+    }
+}

src/endiannessbox.h

➞

Show inline comments

@@ @@ -31,23 +31,26 @@ enum Endianness @@
     LittleEndian,
     BigEndian
 };
 class EndiannessBox : public QWidget
+{
     Q_OBJECT
 public:
     explicit EndiannessBox(QWidget *parent = 0);
     ~EndiannessBox();
     Endianness currentSelection(); ///< currently selected endianness
     /// currently selected endianness
     Endianness currentSelection();
     /// change the currently selected endianness
     void setSelection(Endianness endianness);
 signals:
     /// Signaled when endianness selection is changed
     void selectionChanged(Endianness endianness);
 private:
     Ui::EndiannessBox *ui;
 };
 #endif // ENDIANNESSBOX_H

src/numberformat.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   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 <QMap>
 #include "numberformat.h"
 QMap<NumberFormat, QString> mapping({
         {NumberFormat_uint8, "uint8"},
         {NumberFormat_uint16, "uint16"},
         {NumberFormat_uint32, "uint32"},
         {NumberFormat_int8, "int8"},
         {NumberFormat_int16, "int16"},
         {NumberFormat_int32, "int32"},
         {NumberFormat_float, "float"}
     });
 QString numberFormatToStr(NumberFormat nf)
+{
     return mapping.value(nf);
+}
 NumberFormat strToNumberFormat(QString str)
+{
     return mapping.key(str, NumberFormat_INVALID);
+}

src/numberformat.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   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 NUMBERFORMAT_H
 #define NUMBERFORMAT_H
 #include <QString>
 enum NumberFormat
+{
     NumberFormat_uint8,
     NumberFormat_uint16,
     NumberFormat_uint32,
     NumberFormat_int8,
     NumberFormat_int16,
     NumberFormat_int32,
     NumberFormat_float,
     NumberFormat_INVALID ///< used for error cases
 };
 /// Convert `NumberFormat` to string for representation
 QString numberFormatToStr(NumberFormat nf);
 /// Convert string to `NumberFormat`
 NumberFormat strToNumberFormat(QString str);
 #endif // NUMBERFORMAT_H

src/numberformatbox.cpp

➞

Show inline comments

@@ @@ -45,12 +45,17 @@ NumberFormatBox::~NumberFormatBox() @@
     delete ui;
+}
 void NumberFormatBox::onButtonToggled(int numberFormatId, bool checked)
+{
     if (checked) emit selectionChanged((NumberFormat) numberFormatId);
+}
 NumberFormat NumberFormatBox::currentSelection()
+{
     return (NumberFormat) buttonGroup.checkedId();
+}
 void NumberFormatBox::setSelection(NumberFormat nf)
+{
     buttonGroup.button(nf)->setChecked(true);
+}

src/numberformatbox.h

➞

Show inline comments

@@ @@ -14,48 +14,42 @@ @@
   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 NUMBERFORMATBOX_H
 #define NUMBERFORMATBOX_H
 #include <QWidget>
 #include <QButtonGroup>
 #include "numberformat.h"
 namespace Ui {
 class NumberFormatBox;
+}
 enum NumberFormat
+{
     NumberFormat_uint8,
     NumberFormat_uint16,
     NumberFormat_uint32,
     NumberFormat_int8,
     NumberFormat_int16,
     NumberFormat_int32,
     NumberFormat_float,
 };
 class NumberFormatBox : public QWidget
+{
     Q_OBJECT
 public:
     explicit NumberFormatBox(QWidget *parent = 0);
     ~NumberFormatBox();
     NumberFormat currentSelection(); ///< returns the currently selected number format
     /// returns the currently selected number format
     NumberFormat currentSelection();
     /// change the currently selected number format
     void setSelection(NumberFormat nf);
 signals:
     /// Signaled when number format selection is changed
     void selectionChanged(NumberFormat numberFormat);
 private:
     Ui::NumberFormatBox *ui;
     QButtonGroup buttonGroup;
 private slots:
     void onButtonToggled(int numberFormatId, bool checked);
 };

src/setting_defines.h

➞

Show inline comments

@@ @@ -14,34 +14,40 @@ @@
   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 SETTING_DEFINES_H
 #define SETTING_DEFINES_H
 const char SettingGroup_MainWindow[] = "MainWindow";
 const char SettingGroup_Port[] = "Port";
 const char SettingGroup_DataFormat[] = "DataFormat";
 const char SettingGroup_Binary[] = "DataFormat_Binary";
 const char SettingGroup_Channels[] = "Channels";
 const char SettingGroup_Plot[] = "Plot";
 const char SettingGroup_Commands[] = "Commands";
 // mainwindow setting keys
 const char SG_MainWindow_Size[] = "size";
 const char SG_MainWindow_Pos[] = "pos";
 const char SG_MainWindow_ActivePanel[] = "activePanel";
 const char SG_MainWindow_HidePanels[] = "hidePanels";
 // port setting keys
 const char SG_Port_SelectedPort[] = "selectedPort";
 const char SG_Port_BaudRate[] = "baudRate";
 const char SG_Port_Parity[] = "parity";
 const char SG_Port_DataBits[] = "dataBits";
 const char SG_Port_StopBits[] = "stopBits";
 const char SG_Port_FlowControl[] = "flowControl";
 // data format panel keys
 const char SG_DataFormat_Format[] = "format";
 // binary stream reader keys
 const char SG_Binary_NumOfChannels[] = "numOfChannels";
 const char SG_Binary_NumberFormat[] = "numberFormat";
 const char SG_Binary_Endianness[] = "endianness";
 #endif // SETTING_DEFINES_H

0 comments (0 inline, 0 general)