[Commit-gnuradio] [gnuradio] 10/24: Merge branch 'qtgui_numsink'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 6423d40841676735f3a6087a4486aafe6a5d7dce
Merge: 8fc8014 7d4c52b
Author: Tom Rondeau <address@hidden>
Date:   Sat Mar 15 13:43:35 2014 +0100

    Merge branch 'qtgui_numsink'

 gr-qtgui/grc/qtgui_block_tree.xml                  |   9 +-
 gr-qtgui/grc/qtgui_number_sink.xml                 | 118 +++++++
 gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt     |   3 +
 gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h      |   3 +-
 .../include/gnuradio/qtgui/NumberDisplayPlot.h     |  54 +++
 gr-qtgui/include/gnuradio/qtgui/form_menus.h       | 210 ++++++++++--
 gr-qtgui/include/gnuradio/qtgui/number_sink.h      | 110 ++++++
 .../include/gnuradio/qtgui/numberdisplayform.h     | 101 ++++++
 .../include/gnuradio/qtgui/spectrumUpdateEvents.h  |  26 +-
 gr-qtgui/lib/CMakeLists.txt                        |   5 +
 gr-qtgui/lib/NumberDisplayPlot.cc                  |  63 ++++
 gr-qtgui/lib/number_sink_impl.cc                   | 290 ++++++++++++++++
 gr-qtgui/lib/number_sink_impl.h                    | 114 +++++++
 gr-qtgui/lib/numberdisplayform.cc                  | 375 +++++++++++++++++++++
 gr-qtgui/lib/spectrumUpdateEvents.cc               |  22 ++
 gr-qtgui/swig/qtgui_swig.i                         |   3 +
 16 files changed, 1481 insertions(+), 25 deletions(-)