[Commit-gnuradio] [gnuradio] branch next updated (ae30e21 -> 899761b)

[git]

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

jcorgan pushed a change to branch next
in repository gnuradio.

      from  ae30e21   Merge branch 'master' into next
       new  8cdc041   qtgui: adds control panel to frequency sinks.
       new  b68ba8d   qtgui: toggle legend off in GRC properties.
       new  2f80352   qtgui: added trigger line and controlpanel settings.
       new  875fb3e   qtgui: fixed an issue setting up control panel at runtime.
       new  5ec001c   qtgui: enable/disable waterfall legend.
       new  e2c132f   qtgui: fixed stray variable; also problem between qwt 6.0 
and 6.1.
       new  93e4bfb   qtgui: added stop button to freq control panel.
       new  93c25bc   Merge remote-tracking branch 
'tom/qtgui/freq_control_panel'
       new  899761b   Merge branch 'master' into next

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gr-qtgui/grc/qtgui_const_sink_x.xml                |  21 ++
 gr-qtgui/grc/qtgui_freq_sink_x.xml                 |  38 +++
 gr-qtgui/grc/qtgui_histogram_sink_x.xml            |  21 ++
 gr-qtgui/grc/qtgui_time_sink_x.xml                 |  55 +++-
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml            |  21 ++
 gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt     |   1 +
 gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h      |   9 +
 .../include/gnuradio/qtgui/FrequencyDisplayPlot.h  |  14 +-
 .../include/gnuradio/qtgui/WaterfallDisplayPlot.h  |   4 +
 gr-qtgui/include/gnuradio/qtgui/const_sink_c.h     |   1 +
 gr-qtgui/include/gnuradio/qtgui/displayform.h      |   2 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h      |   4 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h      |   4 +
 .../{timecontrolpanel.h => freqcontrolpanel.h}     |  84 ++++--
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h  |  37 ++-
 gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.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/waterfall_sink_c.h |   1 +
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h |   1 +
 gr-qtgui/lib/CMakeLists.txt                        |   2 +
 gr-qtgui/lib/DisplayPlot.cc                        |   6 +
 gr-qtgui/lib/FrequencyDisplayPlot.cc               |  56 +++-
 gr-qtgui/lib/WaterfallDisplayPlot.cc               |  28 +-
 gr-qtgui/lib/const_sink_c_impl.cc                  |   6 +
 gr-qtgui/lib/const_sink_c_impl.h                   |   1 +
 gr-qtgui/lib/displayform.cc                        |   6 +
 gr-qtgui/lib/freq_sink_c_impl.cc                   |  27 ++
 gr-qtgui/lib/freq_sink_c_impl.h                    |   4 +
 gr-qtgui/lib/freq_sink_f_impl.cc                   |  27 ++
 gr-qtgui/lib/freq_sink_f_impl.h                    |   4 +
 gr-qtgui/lib/freqcontrolpanel.cc                   | 275 +++++++++++++++++
 gr-qtgui/lib/freqdisplayform.cc                    | 331 ++++++++++++++++++++-
 gr-qtgui/lib/histogram_sink_f_impl.cc              |   6 +
 gr-qtgui/lib/histogram_sink_f_impl.h               |   1 +
 gr-qtgui/lib/time_sink_c_impl.cc                   |   6 +
 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/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 +
 43 files changed, 1050 insertions(+), 79 deletions(-)
 copy gr-qtgui/include/gnuradio/qtgui/{timecontrolpanel.h => 
freqcontrolpanel.h} (60%)
 create mode 100644 gr-qtgui/lib/freqcontrolpanel.cc