# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2017-04-01 13:06:48 # Node ID 655c5c52b94225e91fec02fe2ff319943421a116 # Parent b1d64d0822d2286e79b9c0292b3110a0dc6067b6 fix for scaling settings applied wrong these slots are also triggered when loading settings thus should be ignored properly diff --git a/src/plotcontrolpanel.cpp b/src/plotcontrolpanel.cpp --- a/src/plotcontrolpanel.cpp +++ b/src/plotcontrolpanel.cpp @@ -211,7 +211,10 @@ void PlotControlPanel::onAutoScaleChecke void PlotControlPanel::onYScaleChanged() { - emit yScaleChanged(false, ui->spYmin->value(), ui->spYmax->value()); + if (!autoScale()) + { + emit yScaleChanged(false, ui->spYmin->value(), ui->spYmax->value()); + } } bool PlotControlPanel::autoScale() const @@ -276,7 +279,10 @@ void PlotControlPanel::onIndexChecked(bo void PlotControlPanel::onXScaleChanged() { - emit xScaleChanged(false, ui->spXmin->value(), ui->spXmax->value()); + if (!xAxisAsIndex()) + { + emit xScaleChanged(false, ui->spXmin->value(), ui->spXmax->value()); + } } void PlotControlPanel::setChannelInfoModel(ChannelInfoModel* model)