[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/10: qtgui: allow axis labels on/off mode
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/10: qtgui: allow axis labels on/off modes |
|
Date: |
Sun, 21 Feb 2016 15:39:13 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit d5d70208c70866a0d54eae4fc43a16521a654425
Author: Tim O'Shea <address@hidden>
Date: Wed Feb 10 16:03:46 2016 -0500
qtgui: allow axis labels on/off modes
---
gr-qtgui/grc/qtgui_freq_sink_x.xml | 17 +++++++++++++++++
gr-qtgui/grc/qtgui_time_raster_x.xml | 16 ++++++++++++++++
gr-qtgui/grc/qtgui_time_sink_x.xml | 17 +++++++++++++++++
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 17 +++++++++++++++++
gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | 1 +
gr-qtgui/include/gnuradio/qtgui/displayform.h | 3 +++
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 1 +
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 +
gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 1 +
gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 1 +
gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h | 1 +
gr-qtgui/lib/DisplayPlot.cc | 9 +++++++++
gr-qtgui/lib/displayform.cc | 16 ++++++++++++++++
gr-qtgui/lib/freq_sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/freq_sink_c_impl.h | 1 +
gr-qtgui/lib/freq_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/freq_sink_f_impl.h | 1 +
gr-qtgui/lib/freqcontrolpanel.cc | 5 +++++
gr-qtgui/lib/time_sink_c_impl.cc | 8 +++++++-
gr-qtgui/lib/time_sink_c_impl.h | 1 +
gr-qtgui/lib/time_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/time_sink_f_impl.h | 1 +
gr-qtgui/lib/timecontrolpanel.cc | 4 ++++
gr-qtgui/lib/waterfall_sink_c_impl.cc | 6 ++++++
gr-qtgui/lib/waterfall_sink_c_impl.h | 1 +
gr-qtgui/lib/waterfall_sink_f_impl.cc | 6 ++++++
gr-qtgui/lib/waterfall_sink_f_impl.h | 1 +
gr-qtgui/lib/waterfalldisplayform.cc | 6 ++++++
32 files changed, 164 insertions(+), 1 deletion(-)
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml
b/gr-qtgui/grc/qtgui_freq_sink_x.xml
index d7c3139..264e2b2 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml
@@ -26,6 +26,7 @@ self.$(id).set_trigger_mode($tr_mode, $tr_level, $tr_chan,
$tr_tag)
self.$(id).enable_autoscale($autoscale)
self.$(id).enable_grid($grid)
self.$(id).set_fft_average($average)
+self.$(id).enable_axis_labels($axislabels)
self.$(id).enable_control_panel($ctrlpanel)
if not $legend:
@@ -196,6 +197,22 @@ $(gui_hint()($win))</make>
</param>
<param>
+ <name>Axis Labels</name>
+ <key>axislabels</key>
+ <value>True</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
<name>Autoscale</name>
<key>autoscale</key>
<value>False</value>
diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml
b/gr-qtgui/grc/qtgui_time_raster_x.xml
index b36944c..2d747bc 100644
--- a/gr-qtgui/grc/qtgui_time_raster_x.xml
+++ b/gr-qtgui/grc/qtgui_time_raster_x.xml
@@ -24,6 +24,7 @@ qtgui.$(type.fcn)(
self.$(id).set_update_time($update_time)
self.$(id).set_intensity_range($zmin, $zmax)
self.$(id).enable_grid($grid)
+self.$(id).enable_axis_labels($axislabels)
labels = [$label1, $label2, $label3, $label4, $label5,
$label6, $label7, $label8, $label9, $label10]
@@ -185,6 +186,21 @@ $(gui_hint()($win))</make>
<hide>part</hide>
</param>
+ <param>
+ <name>Axis Labels</name>
+ <key>axislabels</key>
+ <value>True</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
<param>
<name>Line 1 Label</name>
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml
b/gr-qtgui/grc/qtgui_time_sink_x.xml
index b17b55f..3097580 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -27,6 +27,7 @@ self.$(id).enable_tags(-1, $entags)
self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_delay,
$tr_chan, $tr_tag)
self.$(id).enable_autoscale($autoscale)
self.$(id).enable_grid($grid)
+self.$(id).enable_axis_labels($axislabels)
self.$(id).enable_control_panel($ctrlpanel)
if not $legend:
@@ -175,6 +176,22 @@ $(gui_hint()($win))</make>
</param>
<param>
+ <name>Axis Labels</name>
+ <key>axislabels</key>
+ <value>True</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
<name>Autoscale</name>
<key>autoscale</key>
<value>False</value>
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
index 1d8461b..1fcf7a9 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
@@ -22,6 +22,7 @@ qtgui.$(type.fcn)(
)
self.$(id).set_update_time($update_time)
self.$(id).enable_grid($grid)
+self.$(id).enable_axis_labels($axislabels)
if not $legend:
self.$(id).disable_legend()
@@ -271,6 +272,22 @@ $(gui_hint()($win))</make>
</param>
<param>
+ <name>Axis Labels</name>
+ <key>axislabels</key>
+ <value>True</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
<name>Line 1 Color</name>
<key>color1</key>
<type>enum</type>
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
index 9edff7b..eba12e2 100644
--- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -190,6 +190,7 @@ public:
public slots:
virtual void disableLegend();
+ virtual void setAxisLabels(bool en);
virtual void setYaxis(double min, double max);
virtual void setXaxis(double min, double max);
virtual void setLineLabel(int which, QString label);
diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h
b/gr-qtgui/include/gnuradio/qtgui/displayform.h
index 2ef4b80..1da1383 100644
--- a/gr-qtgui/include/gnuradio/qtgui/displayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h
@@ -83,6 +83,7 @@ public slots:
void setStop();
void setGrid(bool on);
+ void setAxisLabels(bool en);
void saveFigure();
@@ -117,6 +118,8 @@ protected:
bool d_stop_state;
QAction *d_grid_act;
bool d_grid_state;
+ QAction *d_axislabelsmenu;
+ bool d_axislabels;
QAction *d_autoscale_act;
bool d_autoscale_state;
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
index bf5a91f..8c16d28 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
@@ -182,6 +182,7 @@ namespace gr {
virtual void clear_min_hold() = 0;
virtual void disable_legend() = 0;
virtual void reset() = 0;
+ virtual void enable_axis_labels(bool en=true) = 0;
QApplication *d_qApplication;
};
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
index f13d5c6..98c35b4 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
@@ -188,6 +188,7 @@ namespace gr {
virtual void clear_min_hold() = 0;
virtual void disable_legend() = 0;
virtual void reset() = 0;
+ virtual void enable_axis_labels(bool en=true) = 0;
QApplication *d_qApplication;
};
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
index ce0aeed..ec3ef6c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h
@@ -76,6 +76,7 @@ private:
QVBoxLayout *d_axes_layout;
QCheckBox *d_grid_check;
+ QCheckBox *d_axislabels_check;
QHBoxLayout *d_yrange_layout;
QLabel *d_yrange_label;
QPushButton *d_yrange_plus;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
index 10c87c8..af921af 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
@@ -170,6 +170,7 @@ namespace gr {
virtual void enable_semilogy(bool en=true) = 0;
virtual void enable_control_panel(bool en=true) = 0;
virtual void enable_tags(int which, bool en) = 0;
+ virtual void enable_axis_labels(bool en=true) = 0;
virtual void disable_legend() = 0;
virtual int nsamps() const = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
index d96383c..7ddca46 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
@@ -160,6 +160,7 @@ namespace gr {
virtual void enable_semilogy(bool en=true) = 0;
virtual void enable_control_panel(bool en=true) = 0;
virtual void enable_tags(int which, bool en) = 0;
+ virtual void enable_axis_labels(bool en=true) = 0;
virtual void disable_legend() = 0;
virtual int nsamps() const = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
index aabd890..d7cbf54 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h
@@ -75,6 +75,8 @@ private:
QCheckBox *d_autoscale_check;
QCheckBox *d_grid_check;
+ QCheckBox *d_axislabels_check;
+
QPushButton *d_yoff_plus, *d_yoff_minus;
QPushButton *d_yrange_plus, *d_yrange_minus;
QPushButton *d_xmax_plus, *d_xmax_minus;
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
index 71a8b92..1e4073a 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
@@ -156,6 +156,7 @@ namespace gr {
virtual void enable_menu(bool en=true) = 0;
virtual void enable_grid(bool en=true) = 0;
virtual void disable_legend() = 0;
+ virtual void enable_axis_labels(bool en=true) = 0;
QApplication *d_qApplication;
};
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
index 2a51fba..93c93bd 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
@@ -164,6 +164,7 @@ namespace gr {
virtual void enable_menu(bool en=true) = 0;
virtual void enable_grid(bool en=true) = 0;
virtual void disable_legend() = 0;
+ virtual void enable_axis_labels(bool en=true) = 0;
QApplication *d_qApplication;
};
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
index 6d1e4be..2b3c60f 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
@@ -90,6 +90,7 @@ public slots:
void setPlotPosHalf(bool half);
void setTimePerFFT(double t);
void setUpdateTime(double t);
+ void setAxisLabels(bool en);
private slots:
void newData(const QEvent *updateEvent);
diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc
index 30fd837..59384c8 100644
--- a/gr-qtgui/lib/DisplayPlot.cc
+++ b/gr-qtgui/lib/DisplayPlot.cc
@@ -443,3 +443,12 @@ DisplayPlot::onPickerPointSelected6(const QPointF & p)
//fprintf(stderr,"onPickerPointSelected %f %f\n", point.x(), point.y());
emit plotPointSelected(point);
}
+
+void
+DisplayPlot::setAxisLabels(bool en)
+{
+ enableAxis(0,en);
+ enableAxis(2,en);
+}
+
+
diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc
index 27a0951..13c2d8a 100644
--- a/gr-qtgui/lib/displayform.cc
+++ b/gr-qtgui/lib/displayform.cc
@@ -29,6 +29,7 @@ DisplayForm::DisplayForm(int nplots, QWidget* parent)
: QWidget(parent), d_nplots(nplots), d_system_specified_flag(false)
{
d_isclosed = false;
+ d_axislabels = true;
// Set the initial plot size
resize(QSize(800, 600));
@@ -53,11 +54,18 @@ DisplayForm::DisplayForm(int nplots, QWidget* parent)
this, SLOT(setGrid(bool)));
d_grid_state = false;
+ d_axislabelsmenu = new QAction("Axis Labels", this);
+ d_axislabelsmenu->setCheckable(true);
+ d_axislabelsmenu->setStatusTip(tr("Toggle Axis Labels on/off"));
+ connect(d_axislabelsmenu, SIGNAL(triggered(bool)),
+ this, SLOT(setAxisLabels(bool)));
+
// Create a pop-up menu for manipulating the figure
d_menu_on = true;
d_menu = new QMenu(this);
d_menu->addAction(d_stop_act);
d_menu->addAction(d_grid_act);
+ d_menu->addAction(d_axislabelsmenu);
for(int i = 0; i < d_nplots; i++) {
d_line_title_act.push_back(new LineTitleAction(i, this));
@@ -339,6 +347,14 @@ DisplayForm::setGrid(bool on)
}
void
+DisplayForm::setAxisLabels(bool en)
+{
+ d_axislabels = en;
+ d_axislabelsmenu->setChecked(en);
+ getPlot()->setAxisLabels(d_axislabels);
+}
+
+void
DisplayForm::saveFigure()
{
QPixmap qpix = QPixmap::grabWidget(this);
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 7dc0b2c..b1983e9 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -407,6 +407,12 @@ namespace gr {
}
void
+ freq_sink_c_impl::enable_axis_labels(bool en)
+ {
+ d_main_gui->setAxisLabels(en);
+ }
+
+ void
freq_sink_c_impl::enable_control_panel(bool en)
{
if(en)
diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h
index 8da193b..e73a8fe 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.h
+++ b/gr-qtgui/lib/freq_sink_c_impl.h
@@ -153,6 +153,7 @@ namespace gr {
void clear_min_hold();
void disable_legend();
void reset();
+ void enable_axis_labels(bool en);
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 5418eca..4e7cd1c 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -412,6 +412,12 @@ namespace gr {
}
void
+ freq_sink_f_impl::enable_axis_labels(bool en)
+ {
+ d_main_gui->setAxisLabels(en);
+ }
+
+ void
freq_sink_f_impl::enable_control_panel(bool en)
{
if(en)
diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h
index 39e5c92..1c8f172 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.h
+++ b/gr-qtgui/lib/freq_sink_f_impl.h
@@ -153,6 +153,7 @@ namespace gr {
void clear_min_hold();
void disable_legend();
void reset();
+ void enable_axis_labels(bool en);
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc
index 5840989..9729005 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)),
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 9f1a04c..5e4b96f 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -441,10 +441,16 @@ namespace gr {
d_main_gui->setTagMenu(which, en);
}
+ void
+ time_sink_c_impl::enable_axis_labels(bool en)
+ {
+ d_main_gui->setAxisLabels(en);
+ }
+
void
time_sink_c_impl::disable_legend()
{
- d_main_gui->disableLegend();
+ d_main_gui->disableLegend();
}
void
diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h
index ce6bd94..ff938f8 100644
--- a/gr-qtgui/lib/time_sink_c_impl.h
+++ b/gr-qtgui/lib/time_sink_c_impl.h
@@ -130,6 +130,7 @@ namespace gr {
void enable_semilogy(bool en);
void enable_control_panel(bool en);
void enable_tags(int which, bool en);
+ void enable_axis_labels(bool en);
void disable_legend();
void reset();
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index e81a9f4..59e3f5c 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -437,6 +437,12 @@ namespace gr {
}
void
+ time_sink_f_impl::enable_axis_labels(bool en)
+ {
+ d_main_gui->setAxisLabels(en);
+ }
+
+ void
time_sink_f_impl::disable_legend()
{
d_main_gui->disableLegend();
diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h
index 25d920c..a7a304a 100644
--- a/gr-qtgui/lib/time_sink_f_impl.h
+++ b/gr-qtgui/lib/time_sink_f_impl.h
@@ -130,6 +130,7 @@ namespace gr {
void enable_semilogy(bool en);
void enable_control_panel(bool en);
void enable_tags(int which, bool en);
+ void enable_axis_labels(bool en);
void disable_legend();
void reset();
diff --git a/gr-qtgui/lib/timecontrolpanel.cc b/gr-qtgui/lib/timecontrolpanel.cc
index 4c5a718..5cc434f 100644
--- a/gr-qtgui/lib/timecontrolpanel.cc
+++ b/gr-qtgui/lib/timecontrolpanel.cc
@@ -31,6 +31,7 @@ TimeControlPanel::TimeControlPanel(TimeDisplayForm *form)
d_axes_layout = new QVBoxLayout;
d_autoscale_check = new QCheckBox("Autoscale");
d_grid_check = new QCheckBox("Grid");
+ d_axislabels_check = new QCheckBox("Axis Labels");
d_yoff_layout = new QHBoxLayout;
d_yoff_label = new QLabel("Y Offset:");
@@ -106,6 +107,7 @@ TimeControlPanel::TimeControlPanel(TimeDisplayForm *form)
// Set up the boxes into the layout
d_axes_layout->addWidget(d_autoscale_check);
d_axes_layout->addWidget(d_grid_check);
+ d_axes_layout->addWidget(d_axislabels_check);
d_axes_layout->addLayout(d_yoff_layout);
d_axes_layout->addLayout(d_yrange_layout);
d_axes_layout->addLayout(d_xmax_layout);
@@ -132,6 +134,8 @@ TimeControlPanel::TimeControlPanel(TimeDisplayForm *form)
d_parent, SLOT(autoScale(bool)));
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_yoff_plus, SIGNAL(pressed(void)),
d_parent, SLOT(notifyYAxisPlus(void)));
connect(d_yoff_minus, SIGNAL(pressed(void)),
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index 694ef4d..7395aaf 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -368,6 +368,12 @@ namespace gr {
}
void
+ waterfall_sink_c_impl::enable_axis_labels(bool en)
+ {
+ d_main_gui->setAxisLabels(en);
+ }
+
+ void
waterfall_sink_c_impl::disable_legend()
{
d_main_gui->disableLegend();
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h
b/gr-qtgui/lib/waterfall_sink_c_impl.h
index 3e7f9dd..49766cd 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.h
@@ -132,6 +132,7 @@ namespace gr {
void enable_menu(bool en);
void enable_grid(bool en);
void disable_legend();
+ void enable_axis_labels(bool en);
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index 56c2061..b6f50de 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -374,6 +374,12 @@ namespace gr {
}
void
+ waterfall_sink_f_impl::enable_axis_labels(bool en)
+ {
+ d_main_gui->setAxisLabels(en);
+ }
+
+ void
waterfall_sink_f_impl::disable_legend()
{
d_main_gui->disableLegend();
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h
b/gr-qtgui/lib/waterfall_sink_f_impl.h
index e4f855c..db0f423 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.h
@@ -133,6 +133,7 @@ namespace gr {
void enable_menu(bool en);
void enable_grid(bool en);
void disable_legend();
+ void enable_axis_labels(bool en);
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-qtgui/lib/waterfalldisplayform.cc
b/gr-qtgui/lib/waterfalldisplayform.cc
index b6eb345..9368347 100644
--- a/gr-qtgui/lib/waterfalldisplayform.cc
+++ b/gr-qtgui/lib/waterfalldisplayform.cc
@@ -330,6 +330,12 @@ WaterfallDisplayForm::setTimeTitle(const std::string
title) {
getPlot()->setAxisTitle(QwtPlot::yLeft, title.c_str());
}
+void
+WaterfallDisplayForm::setAxisLabels(bool en)
+{
+
+}
+
float
WaterfallDisplayForm::getClickedFreq() const
{
- [Commit-gnuradio] [gnuradio] branch master updated (64f3b70 -> 762a089), git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 03/10: gr_modtool: add test on license_file for option --copyright. fix typo, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 10/10: Merge remote-tracking branch 'michaelld/fix_version_info', git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 06/10: cmake: when not release and no GIT_EXECUTABLE nad not .git directory in the archive, allow external overriding of version info via GR_GIT_COUNT and GR_GIT_HASH, similar to what UHD allows., git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 05/10: qtgui: fix grc defs for axislabels patch, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 09/10: Merge remote-tracking branch 'noc0lour/gr_modtool-name_option', git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 07/10: Merge branch 'maint', git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 08/10: Merge remote-tracking branch 'osh/qtgui_axislabels_onoff', git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 02/10: gr-utils: modtool: add option --copyright to add function to automatically fillout name in LICENSE file., git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 01/10: qtgui: allow axis labels on/off modes,
git <=
- [Commit-gnuradio] [gnuradio] 04/10: qtgui: add axis labels to raster, constellation, histogram. Fix waterfall axis issue, git, 2016/02/21