# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2017-02-06 14:53:41 # Node ID bfaa0545b85c8867c061207e6c11edc4387901e3 # Parent 9e86c0ca2619389a09bb2fc7cb5a5eacc89c6e90 removed dead code diff --git a/src/dataformatpanel.cpp b/src/dataformatpanel.cpp --- a/src/dataformatpanel.cpp +++ b/src/dataformatpanel.cpp @@ -111,12 +111,6 @@ void DataFormatPanel::enableDemo(bool en } } -void DataFormatPanel::addChannelData(unsigned int channel, - double* data, unsigned size) -{ - _channelMan->addChannelData(channel, data, size); -} - void DataFormatPanel::selectReader(AbstractReader* reader) { currentReader->enable(false); diff --git a/src/dataformatpanel.h b/src/dataformatpanel.h --- a/src/dataformatpanel.h +++ b/src/dataformatpanel.h @@ -82,9 +82,6 @@ private: bool paused; DemoReader demoReader; - - // `data` contains i th channels data - void addChannelData(unsigned int channel, double* data, unsigned size); }; #endif // DATAFORMATPANEL_H diff --git a/src/framedreader.h b/src/framedreader.h --- a/src/framedreader.h +++ b/src/framedreader.h @@ -83,8 +83,6 @@ private: /// reads payload portion of the frame, calculates checksum and commits data /// @note should be called only if there are enough bytes on device void readFrameDataAndCheck(); - // `data` contains i th channels data - void addChannelData(unsigned int channel, double* data, unsigned size); private slots: void onDataReady(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -169,9 +169,6 @@ MainWindow::MainWindow(QWidget *parent) connect(&channelMan, &ChannelManager::numOfChannelsChanged, this, &MainWindow::onNumOfChannelsChanged); - connect(&channelMan, &ChannelManager::channelNameChanged, - this, &MainWindow::onChannelNameChanged); - plotControlPanel.setChannelInfoModel(channelMan.infoModel()); // init curve list @@ -369,17 +366,6 @@ void MainWindow::onNumOfChannelsChanged( plotMan->replot(); } -void MainWindow::onChannelNameChanged(unsigned channel, QString name) -{ - // This slot is triggered also when a new channel is added, in - // this case curve list doesn't contain said channel. No worries, - // since `onNumOfChannelsChanged` slot will update curve list. - if (channel < plotMan->numOfCurves()) // check if channel exists in curve list - { - // plotMan->setTitle(channel, name); - } -} - void MainWindow::onSpsChanged(unsigned sps) { spsLabel.setText(QString::number(sps) + "sps"); diff --git a/src/mainwindow.h b/src/mainwindow.h --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -99,7 +99,6 @@ private slots: void onNumOfSamplesChanged(int value); void onNumOfChannelsChanged(unsigned value); - void onChannelNameChanged(unsigned channel, QString name); void clearPlot(); void onSpsChanged(unsigned sps);