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

@@ @@ -159,3 +159,13 @@ void AsciiReader::onDataReady() @@
         emit dataAdded();
+    }
+}
 void AsciiReader::saveSettings(QSettings* settings)
+{
     _settingsWidget.saveSettings(settings);
+}
 void AsciiReader::loadSettings(QSettings* settings)
+{
     _settingsWidget.loadSettings(settings);
+}

src/asciireader.h

➞

Show inline comments

@@ @@ -20,6 +20,8 @@ @@
 #ifndef ASCIIREADER_H
 #define ASCIIREADER_H
 #include <QSettings>
 #include "abstractreader.h"
 #include "asciireadersettings.h"
@@ @@ -32,6 +34,10 @@ public: @@
     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);

src/asciireadersettings.cpp

➞

Show inline comments

@@ @@ -18,10 +18,13 @@ @@
 */
 #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)
@@ @@ -45,3 +48,40 @@ unsigned AsciiReaderSettings::numOfChann @@
+{
     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

@@ @@ -21,6 +21,7 @@ @@
 #define ASCIIREADERSETTINGS_H
 #include <QWidget>
 #include <QSettings>
 namespace Ui {
 class AsciiReaderSettings;
@@ @@ -35,6 +36,10 @@ public: @@
     ~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);

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -172,6 +172,7 @@ void DataFormatPanel::saveSettings(QSett @@
     // save reader settings
     bsReader.saveSettings(settings);
     asciiReader.saveSettings(settings);
+}
 void DataFormatPanel::loadSettings(QSettings* settings)
@@ @@ -202,4 +203,5 @@ void DataFormatPanel::loadSettings(QSett @@
     // load reader settings
     bsReader.loadSettings(settings);
     asciiReader.loadSettings(settings);
+}

src/setting_defines.h

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ const char SettingGroup_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";
@@ @@ -50,4 +51,7 @@ const char SG_Binary_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)