# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2016-08-25 01:23:49 # Node ID 42deb804719ebfa1faf3dcb015f7e8ff698602d0 # Parent dd4e82b7d5a84ec91f54040946a8b00bf4ab0bb8 added multi plot checkbox to plot panel diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -126,6 +126,9 @@ MainWindow::MainWindow(QWidget *parent) connect(&plotControlPanel, &PlotControlPanel::scaleChanged, ui->plot, &Plot::setAxis); + connect(&plotControlPanel, &PlotControlPanel::multiPlotChanged, + plotMan, &PlotManager::setMulti); + QObject::connect(ui->actionClear, SIGNAL(triggered(bool)), this, SLOT(clearPlot())); diff --git a/src/plotcontrolpanel.cpp b/src/plotcontrolpanel.cpp --- a/src/plotcontrolpanel.cpp +++ b/src/plotcontrolpanel.cpp @@ -60,6 +60,9 @@ PlotControlPanel::PlotControlPanel(QWidg connect(ui->spYmin, SIGNAL(valueChanged(double)), this, SLOT(onYScaleChanged())); + connect(ui->cbMultiPlot, &QCheckBox::toggled, + this, &PlotControlPanel::multiPlotChanged); + // init scale range preset list for (int nbits = 8; nbits <= 24; nbits++) // signed binary formats { @@ -152,3 +155,8 @@ void PlotControlPanel::setChannelNamesMo { ui->lvChannelNames->setModel(model); } + +bool PlotControlPanel::multiPlot() +{ + return ui->cbMultiPlot->isChecked(); +} diff --git a/src/plotcontrolpanel.h b/src/plotcontrolpanel.h --- a/src/plotcontrolpanel.h +++ b/src/plotcontrolpanel.h @@ -39,12 +39,14 @@ public: bool autoScale(); double yMax(); double yMin(); + bool multiPlot(); ///< returns true if multi plot is selected void setChannelNamesModel(QAbstractItemModel * model); signals: void numOfSamplesChanged(int value); void scaleChanged(bool autoScaled, double yMin = 0, double yMax = 1); + void multiPlotChanged(bool enabled); private: Ui::PlotControlPanel *ui; diff --git a/src/plotcontrolpanel.ui b/src/plotcontrolpanel.ui --- a/src/plotcontrolpanel.ui +++ b/src/plotcontrolpanel.ui @@ -157,6 +157,16 @@ + + + + Plot all channels separately + + + Multi Plot + + +