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

@@ @@ -156,6 +156,16 @@ void AsciiReader::onDataReady() @@
                 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

@@ @@ -17,24 +17,30 @@ @@
   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;

src/asciireadersettings.cpp

➞

Show inline comments

@@ @@ -15,16 +15,19 @@ @@
   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);
@@ @@ -42,6 +45,43 @@ AsciiReaderSettings::~AsciiReaderSetting @@
+}
 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

@@ @@ -18,12 +18,13 @@ @@
 */
 #ifndef ASCIIREADERSETTINGS_H
 #define ASCIIREADERSETTINGS_H
 #include <QWidget>
 #include <QSettings>
 namespace Ui {
 class AsciiReaderSettings;
+}
 class AsciiReaderSettings : public QWidget
@@ @@ -32,12 +33,16 @@ class AsciiReaderSettings : public QWidg @@
 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;

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -169,12 +169,13 @@ void DataFormatPanel::saveSettings(QSett @@
     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);
@@ @@ -199,7 +200,8 @@ void DataFormatPanel::loadSettings(QSett @@
     } // else current selection stays
     settings->endGroup();
     // load reader settings
     bsReader.loadSettings(settings);
     asciiReader.loadSettings(settings);
+}

src/setting_defines.h

➞

Show inline comments

@@ @@ -21,12 +21,13 @@ @@
 #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";
@@ @@ -47,7 +48,10 @@ const char SG_DataFormat_Format[] = "for @@
 // 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)