diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-17 07:43:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-17 07:43:33 -0700 |
| commit | 889bad64e63f40ebb1d2862f7957fdbc1acef40f (patch) | |
| tree | c408499d82b1da54f227d398ebe256c4533c6619 | |
| parent | 1f168517ca3a24e1d6647eb523d4163a2d425c8c (diff) | |
| parent | cbc71e7799ca4a41cb140b332444c78f795e18e4 (diff) | |
Merge remote-tracking branch 'sm0svx/qtgui-FrequencySink-ControlPanel-AxisLabels-bugfix' into maint
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqcontrolpanel.cc | 6 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqdisplayform.cc | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h index ec3ef6cfd1..548d693846 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h @@ -45,6 +45,7 @@ public: public slots: void notifyAvgSlider(int val); void toggleGrid(bool en); + void toggleAxisLabels(bool en); void toggleMaxHold(bool en); void toggleMinHold(bool en); diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc index 9729005f50..8babdf0523 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); diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 141df5475c..21d4330722 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -177,6 +177,8 @@ FreqDisplayForm::setupControlPanel() // Connect action items in menu to controlpanel widgets connect(d_grid_act, SIGNAL(triggered(bool)), d_controlpanel, SLOT(toggleGrid(bool))); + connect(d_axislabelsmenu, SIGNAL(triggered(bool)), + d_controlpanel, SLOT(toggleAxisLabels(bool))); connect(d_sizemenu, SIGNAL(whichTrigger(int)), d_controlpanel, SLOT(toggleFFTSize(int))); connect(d_winmenu, SIGNAL(whichTrigger(gr::filter::firdes::win_type)), @@ -199,6 +201,7 @@ FreqDisplayForm::setupControlPanel() d_layout->addLayout(d_controlpanel, 0, 1); d_controlpanel->toggleGrid(d_grid_act->isChecked()); + d_controlpanel->toggleAxisLabels(d_axislabelsmenu->isChecked()); d_controlpanelmenu->setChecked(true); d_controlpanel->toggleTriggerMode(getTriggerMode()); d_controlpanel->toggleMaxHold(d_maxhold_act->isChecked()); |