[Commit-gnuradio] [gnuradio] 37/37: Merge branch 'qt_the_things'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 001ab475e15eb0aeaf9602b823b6ce407d94a66f
Merge: 07b9a87 69a6fa5
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 15 17:11:49 2014 -0400

    Merge branch 'qt_the_things'

 gr-audio/examples/grc/cvsd_sweep.grc               | 2322 ++++++++++++++----
 gr-audio/examples/grc/dial_tone.grc                |  332 ++-
 gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc   |  854 -------
 gr-blocks/examples/ctrlport/pfb_sync_test.grc      |  514 ++--
 gr-blocks/grc/blocks_copy.xml                      |  166 +-
 gr-channels/examples/demo_spec_an.grc              | 1542 ++++++++----
 gr-digital/examples/demod/ber_simulation.grc       | 1022 ++++++--
 gr-digital/examples/demod/digital_freq_lock.grc    | 1680 ++++++++++---
 gr-digital/examples/demod/dpsk_loopback.grc        |  690 ++++--
 gr-digital/examples/demod/mpsk_demod.grc           |  878 +++++--
 gr-digital/examples/demod/pam_sync.grc             | 2108 ++++++++++++----
 gr-digital/examples/demod/pam_timing.grc           | 2462 +++++++++++++++----
 gr-digital/examples/demod/test_corr_and_sync.grc   |  528 ++--
 gr-digital/examples/ofdm/ofdm_loopback.grc         | 1120 ++++++---
 gr-digital/examples/ofdm/rx_ofdm.grc               |  358 ++-
 gr-digital/examples/ofdm/tx_ofdm.grc               | 1134 +++++++--
 gr-digital/grc/digital_constellation.xml           |   90 +-
 .../grc/digital_constellation_receiver_cb.xml      |  143 +-
 gr-digital/grc/digital_constellation_rect.xml      |  102 +-
 gr-fcd/examples/grc/CMakeLists.txt                 |    2 +-
 gr-fcd/examples/grc/fcd_apt_rx.grc                 |  834 +++++--
 .../examples/grc/fcd_fft.grc                       |  468 ++--
 gr-fcd/examples/grc/fcd_fft_wx.grc                 |  320 ---
 gr-fcd/examples/grc/fcd_nfm_rx.grc                 | 1064 +++++---
 gr-fec/grc/variable_cc_decoder_def_list.xml        |    4 +-
 gr-fec/grc/variable_cc_encoder_def_list.xml        |   12 +-
 gr-fec/grc/variable_ccsds_encoder_def_list.xml     |   12 +-
 gr-fec/grc/variable_dummy_decoder_def_list.xml     |    4 +-
 gr-fec/grc/variable_dummy_encoder_def_list.xml     |   12 +-
 .../grc/variable_repetition_decoder_def_list.xml   |    4 +-
 .../grc/variable_repetition_encoder_def_list.xml   |   12 +-
 gr-filter/examples/resampler_demo.grc              |  854 +++++--
 gr-noaa/examples/file_rx_hrpt.grc                  |  648 +++--
 gr-noaa/examples/hrpt_demod.grc                    |  492 ++--
 gr-noaa/examples/usrp_rx_hrpt.grc                  | 1734 +++++++------
 gr-noaa/examples/usrp_rx_hrpt_nogui.grc            |  732 ++++--
 gr-pager/apps/usrp_rx_flex.grc                     | 2146 +++++++++++-----
 gr-qtgui/grc/qtgui_const_sink_x.xml                |   17 +
 gr-qtgui/grc/qtgui_freq_sink_x.xml                 |  142 +-
 gr-qtgui/grc/qtgui_histogram_sink_x.xml            |  228 +-
 gr-qtgui/grc/qtgui_label.xml                       |  110 +-
 gr-qtgui/grc/qtgui_number_sink.xml                 |  158 ++
 gr-qtgui/grc/qtgui_sink_x.xml                      |  334 +--
 gr-qtgui/grc/qtgui_time_raster_x.xml               |  215 +-
 gr-qtgui/grc/qtgui_time_sink_x.xml                 |   36 +
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml            |  252 +-
 .../include/gnuradio/qtgui/FrequencyDisplayPlot.h  |    2 +
 .../include/gnuradio/qtgui/TimeDomainDisplayPlot.h |    3 +
 gr-qtgui/include/gnuradio/qtgui/const_sink_c.h     |    1 +
 gr-qtgui/include/gnuradio/qtgui/form_menus.h       |   64 +
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h  |    2 +
 gr-qtgui/include/gnuradio/qtgui/number_sink.h      |    6 +
 .../include/gnuradio/qtgui/numberdisplayform.h     |   11 +
 gr-qtgui/include/gnuradio/qtgui/time_sink_c.h      |    2 +
 gr-qtgui/include/gnuradio/qtgui/time_sink_f.h      |    2 +
 gr-qtgui/include/gnuradio/qtgui/timedisplayform.h  |    2 +
 .../include/gnuradio/qtgui/timerasterdisplayform.h |    6 +-
 .../include/gnuradio/qtgui/waterfalldisplayform.h  |    6 +-
 gr-qtgui/lib/FrequencyDisplayPlot.cc               |   16 +-
 gr-qtgui/lib/TimeDomainDisplayPlot.cc              |   31 +-
 gr-qtgui/lib/const_sink_c_impl.cc                  |    6 +
 gr-qtgui/lib/const_sink_c_impl.h                   |    1 +
 gr-qtgui/lib/freqdisplayform.cc                    |   28 +
 gr-qtgui/lib/number_sink_impl.cc                   |   38 +-
 gr-qtgui/lib/number_sink_impl.h                    |    6 +
 gr-qtgui/lib/numberdisplayform.cc                  |  110 +-
 gr-qtgui/lib/time_sink_c_impl.cc                   |    7 +
 gr-qtgui/lib/time_sink_c_impl.h                    |    2 +
 gr-qtgui/lib/time_sink_f_impl.cc                   |    7 +
 gr-qtgui/lib/time_sink_f_impl.h                    |    2 +
 gr-qtgui/lib/timedisplayform.cc                    |    8 +-
 gr-qtgui/lib/timerasterdisplayform.cc              |   42 +-
 gr-qtgui/lib/waterfalldisplayform.cc               |   37 +-
 .../examples/grc/interference_cancellation.grc     | 2588 ++++++++++++++------
 gr-trellis/examples/grc/pccc.grc                   |  576 +++--
 gr-trellis/examples/grc/sccc.grc                   |  516 ++--
 gr-uhd/doc/uhd.dox                                 |   56 +-
 gr-uhd/examples/grc/uhd_const_wave.grc             |  468 ++--
 gr-uhd/examples/grc/uhd_dpsk_mod.grc               | 2295 ++++++++++++++---
 gr-uhd/examples/grc/uhd_fft.grc                    | 1749 ++++++++-----
 .../grc/{uhd_const_wave.grc => uhd_msg_tune.grc}   |  548 +++--
 gr-uhd/examples/grc/uhd_rx_dpsk.grc                | 1073 ++++----
 gr-uhd/examples/grc/uhd_two_tone_loopback.grc      |  944 ++++---
 gr-uhd/examples/grc/uhd_tx_dpsk.grc                |  562 +++--
 gr-uhd/examples/grc/uhd_wbfm_receive.grc           |  784 ++++--
 gr-uhd/examples/python/freq_hopping.py             |    6 +-
 gr-uhd/grc/gen_uhd_usrp_blocks.py                  |    5 +
 gr-uhd/include/gnuradio/uhd/usrp_sink.h            |   46 +-
 gr-uhd/include/gnuradio/uhd/usrp_source.h          |   42 +-
 gr-uhd/lib/CMakeLists.txt                          |   13 +
 gr-uhd/lib/usrp_common.h                           |  198 ++
 gr-uhd/lib/usrp_sink_impl.cc                       |  237 +-
 gr-uhd/lib/usrp_sink_impl.h                        |   26 +-
 gr-uhd/lib/usrp_source_impl.cc                     |   94 +-
 gr-uhd/lib/usrp_source_impl.h                      |   31 +-
 gr-zeromq/examples/zeromq_pubsub.grc               |  444 +++-
 gr-zeromq/examples/zeromq_pushpull.grc             |  488 +++-
 gr-zeromq/examples/zeromq_reqrep.grc               |  492 +++-
 grc/base/Block.py                                  |    7 +-
 grc/base/Port.py                                   |   31 +-
 grc/examples/simple/variable_config.grc            |  398 ++-
 grc/examples/xmlrpc/xmlrpc_client.grc              |  262 +-
 grc/examples/xmlrpc/xmlrpc_server.grc              |  750 ++++--
 grc/gui/ActionHandler.py                           |    5 +
 grc/gui/Actions.py                                 |    4 +
 grc/gui/Bars.py                                    |    3 +
 grc/gui/Block.py                                   |   22 +-
 grc/gui/Element.py                                 |    6 +
 grc/gui/FlowGraph.py                               |   77 +-
 grc/gui/Port.py                                    |   66 +-
 grc/gui/Preferences.py                             |    6 +
 grc/python/Block.py                                |   10 +
 grc/python/FlowGraph.py                            |    2 +-
 grc/python/block.dtd                               |    7 +-
 114 files changed, 31836 insertions(+), 13440 deletions(-)