tempo-plotter Changeset - 151c8a6430b7 · protofusion repositories

Changeset - 151c8a6430b7

Parent rev.

Child rev.

[Not reviewed]

reader-stat

0 4 0

Hasan Yavuz ÖZDERYA - 6 years ago 2019-04-17 15:19:34
hy@ozderya.net

improve dataformatpanel api

4 files changed with 16 insertions and 5 deletions:

src/bpslabel.cpp

src/bpslabel.h

src/dataformatpanel.cpp

src/dataformatpanel.h

0 comments (0 inline, 0 general)

src/bpslabel.cpp

➞

Show inline comments

@@ @@ -8,62 +8,67 @@ @@
   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 "bpslabel.h"
 const char* BPS_TOOLTIP = "bits per second";
 const char* BPS_TOOLTIP_ERR = "Maximum baud rate may be reached!";
 BPSLabel::BPSLabel(PortControl* portControl,
                    DataFormatPanel* dataFormatPanel,
                    QWidget *parent) :
     QLabel(parent)
+{
     _portControl = portControl;
     _dataFormatPanel = dataFormatPanel;
     prevBytesRead = 0;
     setText("0bps");
     setToolTip(tr(BPS_TOOLTIP));
     connect(&bpsTimer, &QTimer::timeout,
             this, &BPSLabel::onBpsTimeout);
     connect(portControl, &PortControl::portToggled,
             this, &BPSLabel::onPortToggled);
+}
 void BPSLabel::onBpsTimeout()
+{
     unsigned bits = _dataFormatPanel->getBytesRead() * 8;
     uint64_t curBytesRead = _dataFormatPanel->bytesRead();
     uint64_t bytesRead = curBytesRead - prevBytesRead;
     prevBytesRead = curBytesRead;
     unsigned bits = bytesRead * 8;
     unsigned maxBps = _portControl->maxBitRate();
     QString str;
     if (bits >= maxBps)
+    {
         // TODO: an icon for bps warning
         str = QString(tr("!%1/%2bps")).arg(bits).arg(maxBps);
         setToolTip(tr(BPS_TOOLTIP_ERR));
+    }
     else
+    {
         str = QString(tr("%1bps")).arg(bits);
         setToolTip(tr(BPS_TOOLTIP));
+    }
     setText(str);
+}
 void BPSLabel::onPortToggled(bool open)
+{
     if (open)
+    {
         bpsTimer.start(1000);
+    }
     else
+    {

src/bpslabel.h

➞

Show inline comments

@@ @@ -24,30 +24,32 @@ @@
 #include <QTimer>
 #include "portcontrol.h"
 #include "dataformatpanel.h"
 /**
  * Displays bits per second read from device.
+ *
  * Displays a warning if maximum bit rate is reached.
  */
 class BPSLabel : public QLabel
+{
     Q_OBJECT
 public:
     explicit BPSLabel(PortControl* portControl,
                       DataFormatPanel* dataFormatPanel,
                       QWidget *parent = 0);
 private:
     PortControl* _portControl;
     DataFormatPanel* _dataFormatPanel;
     QTimer bpsTimer;
     uint64_t prevBytesRead;
 private slots:
     void onBpsTimeout();
     void onPortToggled(bool open);
 };
 #endif // BPSLABEL_H

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -18,48 +18,49 @@ @@
 */
 #include "dataformatpanel.h"
 #include "ui_dataformatpanel.h"
 #include <QRadioButton>
 #include <QtDebug>
 #include "utils.h"
 #include "setting_defines.h"
 DataFormatPanel::DataFormatPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel),
     bsReader(port, this),
     asciiReader(port, this),
     framedReader(port, this),
     demoReader(port, this)
+{
     ui->setupUi(this);
     serialPort = port;
     paused = false;
     readerBeforeDemo = nullptr;
     _bytesRead = 0;
     // initalize default reader
     currentReader = &bsReader;
     bsReader.enable();
     ui->rbBinary->setChecked(true);
     ui->horizontalLayout->addWidget(bsReader.settingsWidget(), 1);
     // initalize reader selection buttons
     connect(ui->rbBinary, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&bsReader);
             });
     connect(ui->rbAscii, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&asciiReader);
             });
     connect(ui->rbFramed, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&framedReader);
             });
+}
@@ @@ -109,51 +110,52 @@ bool DataFormatPanel::isDemoEnabled() co @@
+{
     return currentReader == &demoReader;
+}
 void DataFormatPanel::selectReader(AbstractReader* reader)
+{
     currentReader->enable(false);
     reader->enable();
     // re-connect signals
     disconnect(currentReader, 0, this, 0);
     // switch the settings widget
     ui->horizontalLayout->removeWidget(currentReader->settingsWidget());
     currentReader->settingsWidget()->hide();
     ui->horizontalLayout->addWidget(reader->settingsWidget(), 1);
     reader->settingsWidget()->show();
     reader->pause(paused);
     currentReader = reader;
     emit sourceChanged(currentReader);
+}
-unsigned DataFormatPanel::getBytesRead()
+uint64_t DataFormatPanel::bytesRead()
+{
     return currentReader->getBytesRead();
     _bytesRead += currentReader->getBytesRead();
     return _bytesRead;
+}
 void DataFormatPanel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_DataFormat);
     // save selected data format (current reader)
     QString format;
     AbstractReader* selectedReader = isDemoEnabled() ? readerBeforeDemo : currentReader;
     if (selectedReader == &bsReader)
+    {
         format = "binary";
+    }
     else if (selectedReader == &asciiReader)
+    {
         format = "ascii";
+    }
     else // framed reader
+    {
         format = "custom";
+    }
     settings->setValue(SG_DataFormat_Format, format);
     settings->endGroup();

src/dataformatpanel.h

➞

Show inline comments

 /*
   Copyright © 2019 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 DATAFORMATPANEL_H
 #define DATAFORMATPANEL_H
 #include <stdint.h>
 #include <QWidget>
 #include <QButtonGroup>
 #include <QSerialPort>
 #include <QList>
 #include <QSettings>
 #include <QtGlobal>
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "demoreader.h"
 #include "framedreader.h"
 #include "datarecorder.h"
 namespace Ui {
 class DataFormatPanel;
+}
 class DataFormatPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit DataFormatPanel(QSerialPort* port, QWidget* parent = 0);
     ~DataFormatPanel();
     /// Returns currently selected number of channels
     unsigned numChannels() const;
     /// Returns active source (reader)
     Source* activeSource();
     /// Reads and 'zero's number of bytes read from current reader
     unsigned getBytesRead();
     /// Returns total number of bytes read
     uint64_t bytesRead();
     /// 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
 signals:
     /// Active (selected) reader has changed.
     void sourceChanged(Source* source);
 private:
     Ui::DataFormatPanel *ui;
     QSerialPort* serialPort;
     BinaryStreamReader bsReader;
     AsciiReader asciiReader;
     FramedReader framedReader;
     /// Currently selected reader
     AbstractReader* currentReader;
     /// Disable current reader and enable a another one
     void selectReader(AbstractReader* reader);
     bool paused;
     uint64_t _bytesRead;
     DemoReader demoReader;
     AbstractReader* readerBeforeDemo;
     bool isDemoEnabled() const;
 };
 #endif // DATAFORMATPANEL_H

0 comments (0 inline, 0 general)