summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib/freqcontrolpanel.cc
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2016-02-21 07:33:02 -0800
committerJohnathan Corgan <johnathan@corganlabs.com>2016-02-21 07:33:02 -0800
commite34866dad21a98e901c188df7e87f37ae5502a88 (patch)
treefb5dd0f2c395b31c70e65f127ce0190ec2b90a56 /gr-qtgui/lib/freqcontrolpanel.cc
parent4aabba72f0d268174855fce97a80bd55acb1358c (diff)
parent762a08915c252e0604b466dc97d5e51b0a86562d (diff)
Merge branch 'master' into next
Conflicts: gr-utils/python/modtool/templates.py
Diffstat (limited to 'gr-qtgui/lib/freqcontrolpanel.cc')
-rw-r--r--gr-qtgui/lib/freqcontrolpanel.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc
index 5840989949..9729005f50 100644
--- a/gr-qtgui/lib/freqcontrolpanel.cc
+++ b/gr-qtgui/lib/freqcontrolpanel.cc
@@ -50,6 +50,7 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form)
d_axes_layout = new QVBoxLayout;
d_grid_check = new QCheckBox("Grid");
+ d_axislabels_check = new QCheckBox("Axis Labels");
d_yrange_layout = new QHBoxLayout;
d_yrange_label = new QLabel("Y Range:");
d_yrange_plus = new QPushButton("+");
@@ -133,6 +134,7 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form)
d_trace_box->setLayout(d_trace_layout);
d_axes_layout->addWidget(d_grid_check);
+ d_axes_layout->addWidget(d_axislabels_check);
d_axes_layout->addLayout(d_yrange_layout);
d_axes_layout->addLayout(d_ymin_layout);
d_axes_layout->addWidget(d_autoscale_button);
@@ -171,6 +173,9 @@ FreqControlPanel::FreqControlPanel(FreqDisplayForm *form)
connect(d_grid_check, SIGNAL(clicked(bool)),
d_parent, SLOT(setGrid(bool)));
+ connect(d_axislabels_check, SIGNAL(clicked(bool)),
+ d_parent, SLOT(setAxisLabels(bool)));
+
connect(d_ymin_plus, SIGNAL(pressed(void)),
d_parent, SLOT(notifyYAxisPlus(void)));
connect(d_ymin_minus, SIGNAL(pressed(void)),