# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2017-03-13 04:45:34 # Node ID da58111e7ca97ed71dc5342537252294bba71737 # Parent bfd45d598368abf8bade5afd4eb40609908a5b3f fix build problems diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -140,7 +140,7 @@ MainWindow::MainWindow(QWidget *parent) plotMan, &PlotManager::onNumOfSamplesChanged); connect(&plotControlPanel, &PlotControlPanel::yScaleChanged, - plotMan, &PlotManager::setAxis); + plotMan, &PlotManager::setYAxis); QObject::connect(ui->actionClear, SIGNAL(triggered(bool)), this, SLOT(clearPlot())); @@ -212,8 +212,8 @@ MainWindow::MainWindow(QWidget *parent) } // init auto scale - plotMan->setAxis(plotControlPanel.autoScale(), - plotControlPanel.yMin(), plotControlPanel.yMax()); + plotMan->setYAxis(plotControlPanel.autoScale(), + plotControlPanel.yMin(), plotControlPanel.yMax()); // Init sps (sample per second) counter spsLabel.setText("0sps"); diff --git a/src/plotmanager.cpp b/src/plotmanager.cpp --- a/src/plotmanager.cpp +++ b/src/plotmanager.cpp @@ -406,7 +406,7 @@ void PlotManager::darkBackground(bool en } } -void PlotManager::setAxis(bool autoScaled, double yAxisMin, double yAxisMax) +void PlotManager::setYAxis(bool autoScaled, double yAxisMin, double yAxisMax) { _autoScaled = autoScaled; _yMin = yAxisMin;