[Commit-gnuradio] [gnuradio] 04/10: qtgui: add axis labels to raster, constellation, histogram. Fix waterfall axis issue

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5a81915a50b5c86ba5b9fdd7ceac4161e7a444f6
Author: Tim O'Shea <address@hidden>
Date:   Sun Feb 14 14:11:42 2016 -0500

    qtgui: add axis labels to raster, constellation, histogram.  Fix waterfall 
axis issue
---
 gr-qtgui/grc/qtgui_const_sink_x.xml                | 17 +++++++++++
 gr-qtgui/grc/qtgui_freq_sink_x.xml                 | 33 +++++++++++-----------
 gr-qtgui/grc/qtgui_histogram_sink_x.xml            | 17 +++++++++++
 gr-qtgui/grc/qtgui_time_raster_x.xml               |  1 +
 gr-qtgui/grc/qtgui_time_sink_x.xml                 | 33 +++++++++++-----------
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml            |  1 +
 gr-qtgui/include/gnuradio/qtgui/const_sink_c.h     |  1 +
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h  |  1 -
 gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h |  1 +
 .../include/gnuradio/qtgui/time_raster_sink_b.h    |  1 +
 .../include/gnuradio/qtgui/time_raster_sink_f.h    |  1 +
 .../include/gnuradio/qtgui/waterfalldisplayform.h  |  1 -
 gr-qtgui/lib/WaterfallDisplayPlot.cc               |  2 --
 gr-qtgui/lib/const_sink_c_impl.cc                  |  6 ++++
 gr-qtgui/lib/const_sink_c_impl.h                   |  1 +
 gr-qtgui/lib/histogram_sink_f_impl.cc              |  6 ++++
 gr-qtgui/lib/histogram_sink_f_impl.h               |  1 +
 gr-qtgui/lib/time_raster_sink_b_impl.cc            |  6 ++++
 gr-qtgui/lib/time_raster_sink_b_impl.h             |  1 +
 gr-qtgui/lib/time_raster_sink_f_impl.cc            |  6 ++++
 gr-qtgui/lib/time_raster_sink_f_impl.h             |  1 +
 gr-qtgui/lib/timecontrolpanel.cc                   |  1 +
 gr-qtgui/lib/waterfalldisplayform.cc               |  6 ----
 23 files changed, 103 insertions(+), 42 deletions(-)

diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml 
b/gr-qtgui/grc/qtgui_const_sink_x.xml
index 956a169..affa46a 100644
--- a/gr-qtgui/grc/qtgui_const_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_const_sink_x.xml
@@ -276,6 +276,23 @@ $(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>
+    <tab>Config</tab>
+  </param>
+
+  <param>
     <name>Line 1 Label</name>
     <key>label1</key>
     <type>string</type>
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml 
b/gr-qtgui/grc/qtgui_freq_sink_x.xml
index 264e2b2..7fc5669 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml
@@ -197,22 +197,6 @@ $(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>
@@ -400,6 +384,23 @@ $(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>
+    <tab>Config</tab>
+  </param>
+
+  <param>
     <name>Line 1 Label</name>
     <key>label1</key>
     <type>string</type>
diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml 
b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
index a9966fd..bab7d51 100644
--- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
@@ -211,6 +211,23 @@ $(gui_hint()($win))
   </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>
+    <tab>Config</tab>
+  </param>
+
+  <param>
     <name>Line 1 Label</name>
     <key>label1</key>
     <type>string</type>
diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml 
b/gr-qtgui/grc/qtgui_time_raster_x.xml
index 2d747bc..0359dc3 100644
--- a/gr-qtgui/grc/qtgui_time_raster_x.xml
+++ b/gr-qtgui/grc/qtgui_time_raster_x.xml
@@ -200,6 +200,7 @@ $(gui_hint()($win))</make>
       <name>No</name>
       <key>False</key>
     </option>
+    <tab>Config</tab>
   </param>
 
   <param>
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml 
b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 3097580..c0584b6 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -176,22 +176,6 @@ $(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>
@@ -380,6 +364,23 @@ $(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>
+    <tab>Config</tab>
+  </param>
+
+  <param>
     <name>Line 1 Label</name>
     <key>label1</key>
     <type>string</type>
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml 
b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
index 1fcf7a9..cdecd5c 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
@@ -285,6 +285,7 @@ $(gui_hint()($win))</make>
       <name>No</name>
       <key>False</key>
     </option>
+    <tab>Config</tab>
   </param>
 
   <param>
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h 
b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
index 851f3be..9905eb7 100644
--- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
@@ -144,6 +144,7 @@ namespace gr {
       virtual void enable_menu(bool en=true) = 0;
       virtual void enable_autoscale(bool en) = 0;
       virtual void enable_grid(bool en) = 0;
+      virtual void enable_axis_labels(bool en=true) = 0;
       virtual void disable_legend() = 0;
       virtual int nsamps() const = 0;
       virtual void reset() = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h 
b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
index e7b95cb..16b3031 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h
@@ -108,7 +108,6 @@ public slots:
   void notifyTriggerLevelPlus();
   void notifyTriggerLevelMinus();
 
-
 signals:
   void signalFFTSize(int size);
   void signalFFTWindow(gr::filter::firdes::win_type win);
diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h 
b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
index 431941a..6e7dee0 100644
--- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
@@ -121,6 +121,7 @@ namespace gr {
       virtual void enable_semilogx(bool en=true) = 0;
       virtual void enable_semilogy(bool en=true) = 0;
       virtual void enable_accumulate(bool en=true) = 0;
+      virtual void enable_axis_labels(bool en=true) = 0;
       virtual void autoscalex() = 0;
       virtual int nsamps() const = 0;
       virtual int bins() const = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h 
b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
index ed55e2e..efaef1c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
@@ -131,6 +131,7 @@ namespace gr {
       virtual void enable_menu(bool en) = 0;
       virtual void enable_grid(bool en) = 0;
       virtual void enable_autoscale(bool en) = 0;
+      virtual void enable_axis_labels(bool en=true) = 0;
       virtual void reset() = 0;
 
       QApplication *d_qApplication;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h 
b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
index 5610dab..ae2ec8d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
@@ -127,6 +127,7 @@ namespace gr {
       virtual void enable_menu(bool en) = 0;
       virtual void enable_grid(bool en) = 0;
       virtual void enable_autoscale(bool en) = 0;
+      virtual void enable_axis_labels(bool en=true) = 0;
       virtual void reset() = 0;
 
       QApplication *d_qApplication;
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h 
b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
index 2b3c60f..6d1e4be 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h
@@ -90,7 +90,6 @@ 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/WaterfallDisplayPlot.cc 
b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index 676e407..b16c32b 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -657,8 +657,6 @@ WaterfallDisplayPlot::_updateIntensityRangeDisplay()
     setAxisScale(QwtPlot::yRight, intv.minValue(), intv.maxValue());
 #endif
 
-    enableAxis(d_legend_enabled);
-
     plotLayout()->setAlignCanvasToScales(true);
 
     // Tell the display to redraw everything
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc 
b/gr-qtgui/lib/const_sink_c_impl.cc
index 7ef8db3..eaaf5f5 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -375,6 +375,12 @@ namespace gr {
     }
 
     void
+    const_sink_c_impl::enable_axis_labels(bool en)
+    {
+        d_main_gui->setAxisLabels(en);
+    }
+
+    void
     const_sink_c_impl::disable_legend()
     {
       d_main_gui->disableLegend();
diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h
index 7d52c3a..f2dcb6e 100644
--- a/gr-qtgui/lib/const_sink_c_impl.h
+++ b/gr-qtgui/lib/const_sink_c_impl.h
@@ -118,6 +118,7 @@ namespace gr {
       void enable_menu(bool en);
       void enable_autoscale(bool en);
       void enable_grid(bool en);
+      void enable_axis_labels(bool en);
       void disable_legend();
       void reset();
 
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc 
b/gr-qtgui/lib/histogram_sink_f_impl.cc
index 0ac494d..4a1267c 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -346,6 +346,12 @@ namespace gr {
     }
 
     void
+    histogram_sink_f_impl::enable_axis_labels(bool en)
+    {
+        d_main_gui->setAxisLabels(en);
+    }
+
+    void
     histogram_sink_f_impl::enable_autoscale(bool en)
     {
       d_main_gui->autoScale(en);
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h 
b/gr-qtgui/lib/histogram_sink_f_impl.h
index acacf1a..d397bee 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.h
+++ b/gr-qtgui/lib/histogram_sink_f_impl.h
@@ -88,6 +88,7 @@ namespace gr {
       void set_line_alpha(int which, double alpha);
       void set_nsamps(const int newsize);
       void set_bins(const int bins);
+      void enable_axis_labels(bool en);
 
       std::string title();
       std::string line_label(int which);
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc 
b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index 26fed4b..c0990a9 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -418,6 +418,12 @@ namespace gr {
     }
 
     void
+    time_raster_sink_b_impl::enable_axis_labels(bool en)
+    {
+        d_main_gui->setAxisLabels(en);
+    }
+
+    void
     time_raster_sink_b_impl::enable_autoscale(bool en)
     {
       d_main_gui->autoScale(en);
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h 
b/gr-qtgui/lib/time_raster_sink_b_impl.h
index 4da6990..48037b5 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.h
@@ -122,6 +122,7 @@ namespace gr {
       void enable_menu(bool en);
       void enable_grid(bool en);
       void enable_autoscale(bool en);
+      void enable_axis_labels(bool en);
       void reset();
 
       int work(int noutput_items,
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc 
b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index 419d52c..2fb3e7d 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -408,6 +408,12 @@ namespace gr {
     }
 
     void
+    time_raster_sink_f_impl::enable_axis_labels(bool en)
+    {
+        d_main_gui->setAxisLabels(en);
+    }
+
+    void
     time_raster_sink_f_impl::enable_autoscale(bool en)
     {
       d_main_gui->autoScale(en);
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h 
b/gr-qtgui/lib/time_raster_sink_f_impl.h
index ad63e4d..1f25dc5 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.h
@@ -121,6 +121,7 @@ namespace gr {
       void enable_menu(bool en);
       void enable_grid(bool en);
       void enable_autoscale(bool en);
+      void enable_axis_labels(bool en);
       void reset();
 
       int work(int noutput_items,
diff --git a/gr-qtgui/lib/timecontrolpanel.cc b/gr-qtgui/lib/timecontrolpanel.cc
index 5cc434f..95d2cb7 100644
--- a/gr-qtgui/lib/timecontrolpanel.cc
+++ b/gr-qtgui/lib/timecontrolpanel.cc
@@ -32,6 +32,7 @@ TimeControlPanel::TimeControlPanel(TimeDisplayForm *form)
   d_autoscale_check = new QCheckBox("Autoscale");
   d_grid_check = new QCheckBox("Grid");
   d_axislabels_check = new QCheckBox("Axis Labels");
+  d_axislabels_check->setChecked(true);
 
   d_yoff_layout = new QHBoxLayout;
   d_yoff_label = new QLabel("Y Offset:");
diff --git a/gr-qtgui/lib/waterfalldisplayform.cc 
b/gr-qtgui/lib/waterfalldisplayform.cc
index 9368347..b6eb345 100644
--- a/gr-qtgui/lib/waterfalldisplayform.cc
+++ b/gr-qtgui/lib/waterfalldisplayform.cc
@@ -330,12 +330,6 @@ WaterfallDisplayForm::setTimeTitle(const std::string 
title) {
     getPlot()->setAxisTitle(QwtPlot::yLeft, title.c_str());
 }
 
-void
-WaterfallDisplayForm::setAxisLabels(bool en)
-{
-
-}
-
 float
 WaterfallDisplayForm::getClickedFreq() const
 {