diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-11-17 21:20:55 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-11-17 21:21:08 +0100 |
| commit | 7f25c0120fc7bc6a6eeee87878cf387647d51614 (patch) | |
| tree | ab510060a2c5625d00e7f19f4c7d699861b98cea /gr-qtgui/lib/freqcontrolpanel.cc | |
| parent | e1acf2d27760d606cc7cba200aa380e885f2ffaf (diff) | |
| parent | 1d50d70f0b990b909357a803881955623dea94d8 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-qtgui/lib/freqcontrolpanel.cc')
| -rw-r--r-- | gr-qtgui/lib/freqcontrolpanel.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc index 9729005f50..c0a8ed4158 100644 --- a/gr-qtgui/lib/freqcontrolpanel.cc +++ b/gr-qtgui/lib/freqcontrolpanel.cc @@ -229,6 +229,12 @@ FreqControlPanel::toggleGrid(bool en) } void +FreqControlPanel::toggleAxisLabels(bool en) +{ + d_axislabels_check->setChecked(en); +} + +void FreqControlPanel::toggleMaxHold(bool en) { d_maxhold_check->setChecked(en); @@ -243,12 +249,23 @@ FreqControlPanel::toggleMinHold(bool en) void FreqControlPanel::notifyAvgSlider(int val) { - float fval = static_cast<float>(val) / (d_slider_max - d_slider_min); + float fval = static_cast<float>(val) / (d_slider_max - d_slider_min + 1); emit signalAvgSlider(fval); emit signalAvg(true); } void +FreqControlPanel::setFFTAverage(float val) +{ + int slider_val = static_cast<int>(roundf(val * (d_slider_max - d_slider_min + 1))); + if (slider_val > d_slider_max) + slider_val = d_slider_max; + else if (slider_val < d_slider_min) + slider_val = d_slider_min; + d_avg_slider->setValue(slider_val); +} + +void FreqControlPanel::toggleFFTSize(int val) { int index = static_cast<int>(round(logf(static_cast<float>(val))/logf(2.0f))) - 5; |