# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2016-08-25 01:34:48 # Node ID 42da1825ce45c8579a4bdc879e386e7ea311d9dc # Parent 42deb804719ebfa1faf3dcb015f7e8ff698602d0 implemented plotman.replot diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -141,7 +141,7 @@ MainWindow::MainWindow(QWidget *parent) // init data format and reader QObject::connect(&dataFormatPanel, &DataFormatPanel::dataAdded, - ui->plot, &QwtPlot::replot); + plotMan, &PlotManager::replot); QObject::connect(ui->actionPause, &QAction::triggered, &dataFormatPanel, &DataFormatPanel::pause); @@ -297,14 +297,14 @@ void MainWindow::clearPlot() { channelMan.channelBuffer(ci)->clear(); } - ui->plot->replot(); + plotMan->replot(); } void MainWindow::onNumOfSamplesChanged(int value) { numOfSamples = value; channelMan.setNumOfSamples(value); - ui->plot->replot(); + plotMan->replot(); } void MainWindow::onNumOfChannelsChanged(unsigned value) @@ -325,8 +325,7 @@ void MainWindow::onNumOfChannelsChanged( plotMan->removeCurves(oldNum - numOfChannels); } - // TODO: plotman.replot - ui->plot->replot(); + plotMan->replot(); } void MainWindow::onChannelNameChanged(unsigned channel, QString name) @@ -359,7 +358,7 @@ void MainWindow::enableDemo(bool enabled dataFormatPanel.enableDemo(true); ui->actionDemoMode->setChecked(true); demoIndicator.show(); - ui->plot->replot(); + plotMan->replot(); } else { @@ -371,7 +370,7 @@ void MainWindow::enableDemo(bool enabled dataFormatPanel.enableDemo(false); ui->actionDemoMode->setChecked(false); demoIndicator.hide(); - ui->plot->replot(); + plotMan->replot(); } } diff --git a/src/plotmanager.cpp b/src/plotmanager.cpp --- a/src/plotmanager.cpp +++ b/src/plotmanager.cpp @@ -204,3 +204,18 @@ Plot* PlotManager::plotWidget(unsigned c return plotWidgets[0]; } } + +void PlotManager::replot() +{ + if (isMulti) + { + for (auto plot : plotWidgets) + { + plot->replot(); + } + } + else + { + plotWidgets[0]->replot(); + } +} diff --git a/src/plotmanager.h b/src/plotmanager.h --- a/src/plotmanager.h +++ b/src/plotmanager.h @@ -56,6 +56,8 @@ signals: public slots: /// Enable/Disable multiple plot display void setMulti(bool enabled); + /// Update all plot widgets + void replot(); private: bool isMulti;