[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Tue, 8 Dec 2015 00:31:27 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit a342646f7afb27eca1bd12da7569f7e557ee77c6
Merge: 0b0eddb 8bc9c42
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 7 16:22:37 2015 -0800
Merge branch 'next' into next-qt5
.../examples/ctrlport/usrp_sink_controller.py | 42 ++
.../examples/ctrlport/usrp_source_control.grc | 14 +-
.../examples/ctrlport/usrp_source_controller.py | 33 +-
gr-blocks/lib/tagged_stream_align_impl.cc | 2 +-
gr-fec/examples/tpc_ber_curve_gen.py | 457 ---------------------
gr-fec/grc/fec_block_tree.xml | 6 +-
gr-fec/grc/variable_polar_code_configurator.xml | 4 +-
.../grc/variable_polar_decoder_sc_systematic.xml | 68 +++
gr-fec/grc/variable_polar_encoder_systematic.xml | 68 +++
gr-fec/include/gnuradio/fec/CMakeLists.txt | 3 +-
gr-fec/include/gnuradio/fec/polar_common.h | 12 +
.../gnuradio/fec/polar_decoder_sc_systematic.h | 82 ++++
gr-fec/include/gnuradio/fec/polar_encoder.h | 8 -
.../gnuradio/fec/polar_encoder_systematic.h | 111 +++++
gr-fec/lib/CMakeLists.txt | 2 +
gr-fec/lib/polar_common.cc | 53 +++
gr-fec/lib/polar_decoder_sc_systematic.cc | 101 +++++
gr-fec/lib/polar_encoder.cc | 43 +-
gr-fec/lib/polar_encoder_systematic.cc | 79 ++++
gr-fec/python/fec/polar/CMakeLists.txt | 2 +-
gr-fec/python/fec/polar/README.md | 30 +-
gr-fec/python/fec/polar/__init__.py | 8 +-
gr-fec/python/fec/polar/channel_construction.py | 6 +-
...ruction_bsc.py => channel_construction_awgn.py} | 28 +-
.../python/fec/polar/channel_construction_bec.py | 155 ++++++-
gr-fec/python/fec/polar/common.py | 15 +
gr-fec/python/fec/polar/decoder.py | 83 ++--
gr-fec/python/fec/polar/encoder.py | 40 +-
gr-fec/python/fec/polar/helper_functions.py | 49 ++-
gr-fec/python/fec/polar/polar_channel_construction | 2 +-
gr-fec/python/fec/polar/testbed.py | 49 +--
.../python/fec/qa_polar_decoder_sc_systematic.py | 117 ++++++
gr-fec/python/fec/qa_polar_encoder_systematic.py | 107 +++++
gr-fec/swig/fec_swig.i | 7 +-
gr-uhd/lib/usrp_sink_impl.cc | 13 +
gr-uhd/lib/usrp_sink_impl.h | 2 +
grc/base/FlowGraph.py | 8 +-
grc/blocks/epy_block.xml | 2 +-
grc/blocks/epy_module.xml | 33 ++
grc/gui/Actions.py | 2 +-
grc/gui/Block.py | 4 +-
grc/gui/Param.py | 2 +-
grc/gui/PropsDialog.py | 12 +-
grc/python/FlowGraph.py | 35 +-
grc/python/Generator.py | 40 +-
grc/python/Param.py | 2 +-
grc/python/flow_graph.tmpl | 5 +-
47 files changed, 1358 insertions(+), 688 deletions(-)
diff --cc grc/python/flow_graph.tmpl
index 273c205,509c2d0..7a6596a
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@@ -115,9 -116,10 +116,10 @@@ class $(class_name)(gr.top_block, Qt.QW
self.top_layout.addLayout(self.top_grid_layout)
self.settings = Qt.QSettings("GNU Radio", "$class_name")
- self.restoreGeometry(self.settings.value("geometry").toByteArray())
+ self.restoreGeometry(self.settings.value("geometry"))
#elif $generate_options == 'no_gui'
+
class $(class_name)(gr.top_block):
def __init__($param_str):