tempo-plotter Changeset - 5b3f4916ebcf · protofusion repositories

Changeset - 5b3f4916ebcf

Parent rev.

Child rev.

[Not reviewed]

settings

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-05 03:32:57
hy@ozderya.net

implemented settings for ascii reader

6 files changed with 67 insertions and 0 deletions:

src/asciireader.cpp

src/asciireader.h

src/asciireadersettings.cpp

src/asciireadersettings.h

src/dataformatpanel.cpp

src/setting_defines.h

0 comments (0 inline, 0 general)

src/asciireader.cpp

➞

Show inline comments

@@ @@ -150,12 +150,22 @@ void AsciiReader::onDataReady() @@
+            {
                 _channelMan->addChannelData(ci, &channelSample, 1);
                 sampleCount++;
+            }
             else
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
+            }
+        }
         emit dataAdded();
+    }
+}
 void AsciiReader::saveSettings(QSettings* settings)
+{
     _settingsWidget.saveSettings(settings);
+}
 void AsciiReader::loadSettings(QSettings* settings)
+{
     _settingsWidget.loadSettings(settings);
+}

src/asciireader.h

➞

Show inline comments

@@ @@ -11,36 +11,42 @@ @@
   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 ASCIIREADER_H
 #define ASCIIREADER_H
 #include <QSettings>
 #include "abstractreader.h"
 #include "asciireadersettings.h"
 class AsciiReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit AsciiReader(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:
     AsciiReaderSettings _settingsWidget;
     unsigned _numOfChannels;
     /// number of channels will be determined from incoming data
     unsigned autoNumOfChannels;
     bool paused;
     // We may have (usually true) started reading in the middle of a

src/asciireadersettings.cpp

➞

Show inline comments

@@ @@ -9,39 +9,79 @@ @@
   (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 "setting_defines.h"
 #include "asciireadersettings.h"
 #include "ui_asciireadersettings.h"
 #include <QtDebug>
 AsciiReaderSettings::AsciiReaderSettings(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::AsciiReaderSettings)
+{
     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);
             });
+}
 AsciiReaderSettings::~AsciiReaderSettings()
+{
     delete ui;
+}
 unsigned AsciiReaderSettings::numOfChannels()
+{
     return ui->spNumOfChannels->value();
+}
 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);
     settings->endGroup();
+}
 void AsciiReaderSettings::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_ASCII);
     // load number of channels
     QString numOfChannelsSetting =
         settings->value(SG_ASCII_NumOfChannels, numOfChannels()).toString();
     if (numOfChannelsSetting == "auto")
+    {
         ui->spNumOfChannels->setValue(0);
+    }
     else
+    {
         bool ok;
         int nc = numOfChannelsSetting.toInt(&ok);
         if (ok)
+        {
             ui->spNumOfChannels->setValue(nc);
+        }
+    }
     settings->endGroup();
+}

src/asciireadersettings.h

➞

Show inline comments

@@ @@ -12,35 +12,40 @@ @@
   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 ASCIIREADERSETTINGS_H
 #define ASCIIREADERSETTINGS_H
 #include <QWidget>
 #include <QSettings>
 namespace Ui {
 class AsciiReaderSettings;
+}
 class AsciiReaderSettings : public QWidget
+{
     Q_OBJECT
 public:
     explicit AsciiReaderSettings(QWidget *parent = 0);
     ~AsciiReaderSettings();
     unsigned numOfChannels();
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 signals:
     void numOfChannelsChanged(unsigned);
 private:
     Ui::AsciiReaderSettings *ui;
 };
 #endif // ASCIIREADERSETTINGS_H

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -163,24 +163,25 @@ void DataFormatPanel::saveSettings(QSett @@
         format = "ascii";
+    }
     else // framed reader
+    {
         format = "custom";
+    }
     settings->setValue(SG_DataFormat_Format, format);
     settings->endGroup();
     // save reader settings
     bsReader.saveSettings(settings);
     asciiReader.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")
+    {
@@ @@ -193,13 +194,14 @@ void DataFormatPanel::loadSettings(QSett @@
         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);
     asciiReader.loadSettings(settings);
+}

src/setting_defines.h

➞

Show inline comments

@@ @@ -15,24 +15,25 @@ @@
   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_ASCII[] = "DataFormat_ASCII";
 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";
@@ @@ -41,13 +42,16 @@ 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";
 // ascii reader keys
 const char SG_ASCII_NumOfChannels[] = "numOfChannels";
 #endif // SETTING_DEFINES_H

0 comments (0 inline, 0 general)