tempo-plotter Changeset - 1649ccb17332 · protofusion repositories

Changeset - 1649ccb17332

Parent rev.

Child rev.

[Not reviewed]

recording

0 7 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-14 06:09:07
hy@ozderya.net

moved dataAdded signal to channel manager class

7 files changed with 6 insertions and 12 deletions:

src/abstractreader.cpp

src/abstractreader.h

src/channelmanager.cpp

src/channelmanager.h

src/dataformatpanel.cpp

src/dataformatpanel.h

src/mainwindow.cpp

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

@@ @@ -46,8 +46,7 @@ void AbstractReader::spsTimerTimeout() @@
+}
 void AbstractReader::addData(double* samples, unsigned length)
+{
     _channelMan->addData(samples, length);
     sampleCount += length;
     emit dataAdded();
+}

src/abstractreader.h

➞

Show inline comments

@@ @@ -53,15 +53,12 @@ public: @@
     /// Reader should only read when enabled. Default state should be
     /// 'disabled'.
     virtual void enable(bool enabled = true) = 0;
 signals:
     void numOfChannelsChanged(unsigned);
     // TODO: this must be signaled by 'channel man' for better abstraction
     void dataAdded(); ///< emitted when data added to channel man.
     // TODO: this should be a part of 'channel man'
     void samplesPerSecondChanged(unsigned);
 public slots:
     /**
      * Pauses the reading.
+     *

src/channelmanager.cpp

➞

Show inline comments

@@ @@ -167,12 +167,14 @@ void ChannelManager::addData(double* dat @@
     int n = size / _numOfChannels;
     for (unsigned ci = 0; ci < _numOfChannels; ci++)
+    {
         channelBuffers[ci]->addSamples(&data[ci*n], n);
+    }
     emit dataAdded();
+}
 void ChannelManager::saveSettings(QSettings* settings)
+{
     _infoModel.saveSettings(settings);
+}

src/channelmanager.h

➞

Show inline comments

@@ @@ -51,12 +51,13 @@ public: @@
     QStringList channelNames();
 signals:
     void numOfChannelsChanged(unsigned value);
     void numOfSamplesChanged(unsigned value);
     void channelNameChanged(unsigned channel, QString name);
     void dataAdded(); ///< emitted when data added to channel man.
 public slots:
     void setNumOfChannels(unsigned number);
     void setNumOfSamples(unsigned number);
     /**
      * Add data for all channels.

src/dataformatpanel.cpp

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 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
@@ @@ -47,13 +47,12 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     // initalize default reader
     currentReader = &bsReader;
     bsReader.enable();
     ui->rbBinary->setChecked(true);
     ui->horizontalLayout->addWidget(bsReader.settingsWidget(), 1);
     connect(&bsReader, SIGNAL(dataAdded()), this, SIGNAL(dataAdded()));
     connect(&bsReader, SIGNAL(numOfChannelsChanged(unsigned)),
             this, SIGNAL(numOfChannelsChanged(unsigned)));
     connect(&bsReader, SIGNAL(samplesPerSecondChanged(unsigned)),
             this, SIGNAL(samplesPerSecondChanged(unsigned)));
     // initalize reader selection buttons
@@ @@ -96,14 +95,12 @@ void DataFormatPanel::pause(bool enabled @@
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoReader.enable();
         connect(&demoReader, &DemoReader::dataAdded,
                 this, &DataFormatPanel::dataAdded);
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
+    }
     else
+    {
         demoReader.enable(false);
@@ @@ -115,13 +112,12 @@ void DataFormatPanel::selectReader(Abstr @@
+{
     currentReader->enable(false);
     reader->enable();
     // re-connect signals
     disconnect(currentReader, 0, this, 0);
     connect(reader, SIGNAL(dataAdded()), this, SIGNAL(dataAdded()));
     connect(reader, SIGNAL(numOfChannelsChanged(unsigned)),
             this, SIGNAL(numOfChannelsChanged(unsigned)));
     connect(reader, SIGNAL(samplesPerSecondChanged(unsigned)),
             this, SIGNAL(samplesPerSecondChanged(unsigned)));
     // switch the settings widget

src/dataformatpanel.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 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
@@ @@ -60,13 +60,12 @@ public slots: @@
     void pause(bool);
     void enableDemo(bool); // demo shouldn't be enabled when port is open
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
     void dataAdded();
 private:
     Ui::DataFormatPanel *ui;
     QSerialPort* serialPort;
     ChannelManager* _channelMan;

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -151,13 +151,13 @@ MainWindow::MainWindow(QWidget *parent) @@
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // TODO: `replot` must be triggered from ChannelManager
     // init data format and reader
-    QObject::connect(&dataFormatPanel, &DataFormatPanel::dataAdded,
+    QObject::connect(&channelMan, &ChannelManager::dataAdded,
                      plotMan, &PlotManager::replot);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      &dataFormatPanel, &DataFormatPanel::pause);
     // init data arrays and plot

0 comments (0 inline, 0 general)