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

@@ @@ -49,5 +49,4 @@ void AbstractReader::addData(double* sam @@
+{
     _channelMan->addData(samples, length);
     sampleCount += length;
     emit dataAdded();
+}

src/abstractreader.h

➞

Show inline comments

@@ @@ -56,9 +56,6 @@ public: @@
 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:

src/channelmanager.cpp

➞

Show inline comments

@@ @@ -170,6 +170,8 @@ void ChannelManager::addData(double* dat @@
+    {
         channelBuffers[ci]->addSamples(&data[ci*n], n);
+    }
     emit dataAdded();
+}
 void ChannelManager::saveSettings(QSettings* settings)

src/channelmanager.h

➞

Show inline comments

@@ @@ -54,6 +54,7 @@ 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);

src/dataformatpanel.cpp

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
@@ @@ -50,7 +50,6 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     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)),
@@ @@ -99,8 +98,6 @@ void DataFormatPanel::enableDemo(bool en @@
     if (enabled)
+    {
         demoReader.enable();
         connect(&demoReader, &DemoReader::dataAdded,
                 this, &DataFormatPanel::dataAdded);
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
+    }
@@ @@ -118,7 +115,6 @@ void DataFormatPanel::selectReader(Abstr @@
     // 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)),

src/dataformatpanel.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
@@ @@ -63,7 +63,6 @@ public slots: @@
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
     void dataAdded();
 private:
     Ui::DataFormatPanel *ui;

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -154,7 +154,7 @@ MainWindow::MainWindow(QWidget *parent) @@
     // 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,

0 comments (0 inline, 0 general)