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

@@ @@ -29,6 +29,7 @@ BPSLabel::BPSLabel(PortControl* portCont @@
+{
     _portControl = portControl;
     _dataFormatPanel = dataFormatPanel;
     prevBytesRead = 0;
     setText("0bps");
     setToolTip(tr(BPS_TOOLTIP));
@@ @@ -42,7 +43,11 @@ BPSLabel::BPSLabel(PortControl* portCont @@
 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)

src/bpslabel.h

➞

Show inline comments

@@ @@ -45,6 +45,8 @@ private: @@
     DataFormatPanel* _dataFormatPanel;
     QTimer bpsTimer;
     uint64_t prevBytesRead;
 private slots:
     void onBpsTimeout();
     void onPortToggled(bool open);

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -39,6 +39,7 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     serialPort = port;
     paused = false;
     readerBeforeDemo = nullptr;
     _bytesRead = 0;
     // initalize default reader
     currentReader = &bsReader;
@@ @@ -130,9 +131,10 @@ void DataFormatPanel::selectReader(Abstr @@
     emit sourceChanged(currentReader);
+}
-unsigned DataFormatPanel::getBytesRead()
+uint64_t DataFormatPanel::bytesRead()
+{
     return currentReader->getBytesRead();
     _bytesRead += currentReader->getBytesRead();
     return _bytesRead;
+}
 void DataFormatPanel::saveSettings(QSettings* settings)

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -20,6 +20,7 @@ @@
 #ifndef DATAFORMATPANEL_H
 #define DATAFORMATPANEL_H
 #include <stdint.h>
 #include <QWidget>
 #include <QButtonGroup>
 #include <QSerialPort>
@@ @@ -49,8 +50,8 @@ public: @@
     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`.
@@ @@ -78,6 +79,7 @@ private: @@
     void selectReader(AbstractReader* reader);
     bool paused;
     uint64_t _bytesRead;
     DemoReader demoReader;
     AbstractReader* readerBeforeDemo;

0 comments (0 inline, 0 general)