tempo-plotter Changeset - 94b1aaec4e69 · protofusion repositories

Changeset - 94b1aaec4e69

Parent rev.

Child rev.

[Not reviewed]

stream

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-04-15 04:42:01
hy@ozderya.net

reworked DataFormatPanel for new design, not tested

dependency and direct interactions with ChannelManager and DataRecorder is removed

2 files changed with 23 insertions and 47 deletions:

src/dataformatpanel.cpp

src/dataformatpanel.h

0 comments (0 inline, 0 general)

src/dataformatpanel.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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
@@ @@ -18,35 +18,28 @@ @@
 */
 #include "dataformatpanel.h"
 #include "ui_dataformatpanel.h"
 #include <QRadioButton>
 #include <QtEndian>
 #include <QMap>
 #include <QtDebug>
 #include "utils.h"
 #include "setting_defines.h"
 #include "floatswap.h"
 DataFormatPanel::DataFormatPanel(QSerialPort* port,
                                  ChannelManager* channelMan,
                                  DataRecorder* recorder,
                                  QWidget *parent) :
 DataFormatPanel::DataFormatPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel),
     bsReader(port, channelMan, recorder, this),
     asciiReader(port, channelMan, recorder, this),
     framedReader(port, channelMan, recorder, this),
     demoReader(port, channelMan, recorder, this)
     bsReader(port, this),
     asciiReader(port, this),
     framedReader(port, this),
     demoReader(port, this)
+{
     ui->setupUi(this);
     serialPort = port;
     _channelMan = channelMan;
     paused = false;
     demoEnabled = false;
     // initalize default reader
     currentReader = &bsReader;
     bsReader.enable();
@@ @@ -80,15 +73,20 @@ DataFormatPanel::DataFormatPanel(QSerial @@
 DataFormatPanel::~DataFormatPanel()
+{
     delete ui;
+}
-unsigned DataFormatPanel::numOfChannels()
+unsigned DataFormatPanel::numChannels() const
+{
     return currentReader->numOfChannels();
     return currentReader->numChannels();
+}
 Source* DataFormatPanel::activeSource()
+{
     return &currentReader;
+}
 void DataFormatPanel::pause(bool enabled)
+{
     paused = enabled;
     currentReader->pause(enabled);
@@ @@ -97,36 +95,25 @@ void DataFormatPanel::pause(bool enabled @@
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoReader.enable();
         demoReader.recording = currentReader->recording;
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
         emit sourceChanged(&demoreader);
+    }
     else
+    {
         demoReader.enable(false);
         disconnect(&demoReader, 0, this, 0);
         emit sourceChanged(currentReader);
+    }
     demoEnabled = enabled;
+}
 void DataFormatPanel::startRecording()
+{
     currentReader->recording = true;
     if (demoEnabled) demoReader.recording = true;
+}
 void DataFormatPanel::stopRecording()
+{
     currentReader->recording = false;
     if (demoEnabled) demoReader.recording = false;
+}
 void DataFormatPanel::selectReader(AbstractReader* reader)
+{
     currentReader->enable(false);
     reader->enable();
     // re-connect signals
@@ @@ -149,12 +136,13 @@ void DataFormatPanel::selectReader(Abstr @@
+    }
     reader->pause(paused);
     reader->recording = currentReader->recording;
     currentReader = reader;
     emit sourceChanged(currentReader);
+}
 void DataFormatPanel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_DataFormat);

src/dataformatpanel.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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
@@ @@ -25,14 +25,12 @@ @@
 #include <QTimer>
 #include <QSerialPort>
 #include <QList>
 #include <QSettings>
 #include <QtGlobal>
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "demoreader.h"
 #include "framedreader.h"
 #include "datarecorder.h"
@@ @@ -42,48 +40,38 @@ class DataFormatPanel; @@
 class DataFormatPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit DataFormatPanel(QSerialPort* port,
                              ChannelManager* channelMan,
                              DataRecorder* recorder,
                              QWidget* parent = 0);
     explicit DataFormatPanel(QSerialPort* port, QWidget* parent = 0);
     ~DataFormatPanel();
     /// Returns currently selected number of channels
     unsigned numOfChannels();
     unsigned numChannels() const;
     /// Returns active source (reader)
     Source* activeSource();
     /// Stores data format panel settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads data format panel settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     void pause(bool);
     void enableDemo(bool); // demo shouldn't be enabled when port is open
     /**
      * @brief Starts sending data to recorder.
+     *
      * @note recorder must have been started!
      */
     void startRecording();
     /// Stops recording.
     void stopRecording();
 signals:
     /// Active (selected) reader has changed.
     void sourceChanged(Source* source);
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
 private:
     Ui::DataFormatPanel *ui;
     QSerialPort* serialPort;
     ChannelManager* _channelMan;
     BinaryStreamReader bsReader;
     AsciiReader asciiReader;
     FramedReader framedReader;
     /// Currently selected reader
     AbstractReader* currentReader;

0 comments (0 inline, 0 general)