# HG changeset patch
# User Hasan Yavuz ÖZDERYA <hy@ozderya.net>
# Date 2017-02-14 06:09:07
# Node ID 1649ccb17332342dbdfe9bf196407e11ea6d93fd
# Parent  538d40c57b2b222add97a5836268d47e842184c5

moved dataAdded signal to channel manager class

diff --git a/src/abstractreader.cpp b/src/abstractreader.cpp
--- a/src/abstractreader.cpp
+++ b/src/abstractreader.cpp
@@ -49,5 +49,4 @@ void AbstractReader::addData(double* sam
 {
     _channelMan->addData(samples, length);
     sampleCount += length;
-    emit dataAdded();
 }
diff --git a/src/abstractreader.h b/src/abstractreader.h
--- a/src/abstractreader.h
+++ b/src/abstractreader.h
@@ -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:
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp
--- a/src/channelmanager.cpp
+++ b/src/channelmanager.cpp
@@ -170,6 +170,8 @@ void ChannelManager::addData(double* dat
     {
         channelBuffers[ci]->addSamples(&data[ci*n], n);
     }
+
+    emit dataAdded();
 }
 
 void ChannelManager::saveSettings(QSettings* settings)
diff --git a/src/channelmanager.h b/src/channelmanager.h
--- a/src/channelmanager.h
+++ b/src/channelmanager.h
@@ -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);
diff --git a/src/dataformatpanel.cpp b/src/dataformatpanel.cpp
--- a/src/dataformatpanel.cpp
+++ b/src/dataformatpanel.cpp
@@ -1,5 +1,5 @@
 /*
-  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)),
diff --git a/src/dataformatpanel.h b/src/dataformatpanel.h
--- a/src/dataformatpanel.h
+++ b/src/dataformatpanel.h
@@ -1,5 +1,5 @@
 /*
-  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;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -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,