summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--README.building-boost25
-rw-r--r--README.hacking100
-rw-r--r--cmake/Modules/FindQwt.cmake4
-rw-r--r--docs/doxygen/Doxyfile.in738
-rw-r--r--docs/doxygen/Doxyfile.swig_doc.in665
-rw-r--r--docs/doxygen/gnuradio_logo_icon.pngbin0 -> 2920 bytes
-rw-r--r--gnuradio-runtime/include/gnuradio/thread/thread.h3
-rw-r--r--gnuradio-runtime/lib/pmt/pmt.cc3
-rw-r--r--gnuradio-runtime/lib/thread/thread.cc71
-rw-r--r--gnuradio-runtime/lib/tpb_thread_body.cc2
-rw-r--r--gnuradio-runtime/python/pmt/pmt_to_python.py51
-rwxr-xr-xgnuradio-runtime/python/pmt/qa_pmt_to_python.py16
-rw-r--r--gr-blocks/grc/blocks_socket_pdu.xml28
-rw-r--r--gr-blocks/grc/blocks_throttle.xml1
-rw-r--r--gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h9
-rw-r--r--gr-blocks/include/gnuradio/blocks/short_to_char.h6
-rw-r--r--gr-blocks/include/gnuradio/blocks/socket_pdu.h3
-rw-r--r--gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h8
-rw-r--r--gr-blocks/lib/socket_pdu_impl.cc144
-rw-r--r--gr-blocks/lib/socket_pdu_impl.h5
-rw-r--r--gr-blocks/lib/stream_mux_impl.cc115
-rw-r--r--gr-blocks/lib/stream_mux_impl.h6
-rw-r--r--gr-blocks/lib/tcp_connection.cc50
-rw-r--r--gr-blocks/lib/tcp_connection.h8
-rwxr-xr-xgr-blocks/python/blocks/qa_stream_mux.py16
-rw-r--r--gr-digital/examples/demod/test_corr_and_sync.grc1626
-rw-r--r--gr-digital/grc/digital_block_tree.xml13
-rw-r--r--gr-digital/grc/digital_constellation_modulator.xml2
-rw-r--r--gr-digital/grc/digital_dxpsk_demod.xml2
-rw-r--r--gr-digital/grc/digital_dxpsk_mod.xml2
-rw-r--r--gr-digital/grc/digital_gfsk_demod.xml2
-rw-r--r--gr-digital/grc/digital_gfsk_mod.xml2
-rw-r--r--gr-digital/grc/digital_gmsk_demod.xml2
-rw-r--r--gr-digital/grc/digital_gmsk_mod.xml2
-rw-r--r--gr-digital/grc/digital_hdlc_deframer_bp.xml32
-rw-r--r--gr-digital/grc/digital_hdlc_framer_pb.xml20
-rw-r--r--gr-digital/grc/digital_header_payload_demux.xml5
-rw-r--r--gr-digital/grc/digital_psk_demod.xml2
-rw-r--r--gr-digital/grc/digital_psk_mod.xml2
-rw-r--r--gr-digital/grc/digital_qam_demod.xml2
-rw-r--r--gr-digital/grc/digital_qam_mod.xml2
-rw-r--r--gr-digital/include/gnuradio/digital/CMakeLists.txt2
-rw-r--r--gr-digital/include/gnuradio/digital/costas_loop_cc.h18
-rw-r--r--gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h62
-rw-r--r--gr-digital/include/gnuradio/digital/hdlc_framer_pb.h65
-rw-r--r--gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h30
-rw-r--r--gr-digital/lib/CMakeLists.txt2
-rw-r--r--gr-digital/lib/correlate_access_code_tag_bb_impl.cc35
-rw-r--r--gr-digital/lib/costas_loop_cc_impl.cc18
-rw-r--r--gr-digital/lib/costas_loop_cc_impl.h10
-rw-r--r--gr-digital/lib/hdlc_deframer_bp_impl.cc160
-rw-r--r--gr-digital/lib/hdlc_deframer_bp_impl.h54
-rw-r--r--gr-digital/lib/hdlc_framer_pb_impl.cc184
-rw-r--r--gr-digital/lib/hdlc_framer_pb_impl.h55
-rw-r--r--gr-digital/lib/mpsk_receiver_cc_impl.cc60
-rw-r--r--gr-digital/lib/mpsk_receiver_cc_impl.h24
-rw-r--r--gr-digital/python/digital/gmsk.py6
-rw-r--r--gr-digital/python/digital/packet_utils.py2
-rw-r--r--gr-digital/python/digital/psk.py18
-rwxr-xr-xgr-digital/python/digital/qa_hdlc_framer.py64
-rw-r--r--gr-digital/swig/digital_swig.i6
-rw-r--r--gr-filter/examples/channelizer_demo.grc1265
-rw-r--r--gr-filter/grc/CMakeLists.txt2
-rw-r--r--gr-filter/grc/filter_block_tree.xml2
-rw-r--r--gr-filter/grc/filter_filterbank_vcvcf.xml29
-rw-r--r--gr-filter/grc/filter_pfb_channelizer_hier.xml80
-rw-r--r--gr-filter/include/gnuradio/filter/CMakeLists.txt2
-rw-r--r--gr-filter/include/gnuradio/filter/filterbank.h97
-rw-r--r--gr-filter/include/gnuradio/filter/filterbank_vcvcf.h76
-rw-r--r--gr-filter/lib/CMakeLists.txt2
-rw-r--r--gr-filter/lib/filterbank.cc112
-rw-r--r--gr-filter/lib/filterbank_vcvcf_impl.cc125
-rw-r--r--gr-filter/lib/filterbank_vcvcf_impl.h57
-rw-r--r--gr-filter/python/filter/pfb.py83
-rw-r--r--gr-filter/python/filter/qa_filterbank.py130
-rwxr-xr-xgr-filter/python/filter/qa_pfb_channelizer.py144
-rw-r--r--gr-filter/swig/filter_swig.i5
-rw-r--r--gr-qtgui/grc/qtgui_block_tree.xml9
-rw-r--r--gr-qtgui/grc/qtgui_const_sink_x.xml767
-rw-r--r--gr-qtgui/grc/qtgui_freq_sink_x.xml551
-rw-r--r--gr-qtgui/grc/qtgui_histogram_sink_x.xml636
-rw-r--r--gr-qtgui/grc/qtgui_number_sink.xml338
-rw-r--r--gr-qtgui/grc/qtgui_time_raster_x.xml278
-rw-r--r--gr-qtgui/grc/qtgui_time_sink_x.xml969
-rw-r--r--gr-qtgui/grc/qtgui_waterfall_sink_x.xml300
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/NumberDisplayPlot.h54
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/const_sink_c.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/form_menus.h209
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h5
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h5
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/number_sink.h108
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h105
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/qtgui_types.h25
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/sink_c.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/sink_f.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h26
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/time_sink_c.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/time_sink_f.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h3
-rw-r--r--gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h3
-rw-r--r--gr-qtgui/lib/CMakeLists.txt5
-rw-r--r--gr-qtgui/lib/NumberDisplayPlot.cc63
-rw-r--r--gr-qtgui/lib/const_sink_c_impl.cc6
-rw-r--r--gr-qtgui/lib/const_sink_c_impl.h2
-rw-r--r--gr-qtgui/lib/freq_sink_c_impl.cc6
-rw-r--r--gr-qtgui/lib/freq_sink_c_impl.h2
-rw-r--r--gr-qtgui/lib/freq_sink_f_impl.cc6
-rw-r--r--gr-qtgui/lib/freq_sink_f_impl.h2
-rw-r--r--gr-qtgui/lib/freqdisplayform.cc1
-rw-r--r--gr-qtgui/lib/histogram_sink_f_impl.cc6
-rw-r--r--gr-qtgui/lib/histogram_sink_f_impl.h2
-rw-r--r--gr-qtgui/lib/histogramdisplayform.cc9
-rw-r--r--gr-qtgui/lib/number_sink_impl.cc310
-rw-r--r--gr-qtgui/lib/number_sink_impl.h117
-rw-r--r--gr-qtgui/lib/numberdisplayform.cc441
-rw-r--r--gr-qtgui/lib/sink_c_impl.cc6
-rw-r--r--gr-qtgui/lib/sink_c_impl.h2
-rw-r--r--gr-qtgui/lib/sink_f_impl.cc6
-rw-r--r--gr-qtgui/lib/sink_f_impl.h2
-rw-r--r--gr-qtgui/lib/spectrumUpdateEvents.cc22
-rw-r--r--gr-qtgui/lib/time_raster_sink_b_impl.cc6
-rw-r--r--gr-qtgui/lib/time_raster_sink_b_impl.h2
-rw-r--r--gr-qtgui/lib/time_raster_sink_f_impl.cc6
-rw-r--r--gr-qtgui/lib/time_raster_sink_f_impl.h2
-rw-r--r--gr-qtgui/lib/time_sink_c_impl.cc6
-rw-r--r--gr-qtgui/lib/time_sink_c_impl.h2
-rw-r--r--gr-qtgui/lib/time_sink_f_impl.cc6
-rw-r--r--gr-qtgui/lib/time_sink_f_impl.h2
-rw-r--r--gr-qtgui/lib/timerasterdisplayform.cc5
-rw-r--r--gr-qtgui/lib/waterfall_sink_c_impl.cc6
-rw-r--r--gr-qtgui/lib/waterfall_sink_c_impl.h2
-rw-r--r--gr-qtgui/lib/waterfall_sink_f_impl.cc6
-rw-r--r--gr-qtgui/lib/waterfall_sink_f_impl.h2
-rw-r--r--gr-qtgui/swig/qtgui_swig.i24
-rw-r--r--gr-uhd/python/uhd/qa_uhd.py8
-rw-r--r--gr-uhd/swig/uhd_swig.i15
-rw-r--r--gr-utils/python/modtool/gr-newmod/CMakeLists.txt10
-rw-r--r--gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in736
-rw-r--r--gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in670
-rw-r--r--gr-vocoder/lib/CMakeLists.txt74
-rw-r--r--grc/base/Block.py19
-rw-r--r--grc/base/Constants.py4
-rw-r--r--grc/base/Element.py1
-rw-r--r--grc/base/FlowGraph.py66
-rw-r--r--grc/base/Param.py16
-rw-r--r--grc/base/Platform.py1
-rw-r--r--grc/blocks/dummy.xml11
-rw-r--r--grc/grc_gnuradio/blks2/packet.py2
-rw-r--r--grc/gui/ActionHandler.py42
-rw-r--r--grc/gui/Actions.py14
-rw-r--r--grc/gui/Bars.py6
-rw-r--r--grc/gui/Block.py11
-rw-r--r--grc/gui/Colors.py3
-rw-r--r--grc/gui/DrawingArea.py10
-rw-r--r--grc/gui/FlowGraph.py11
-rw-r--r--grc/gui/Messages.py11
-rw-r--r--grc/gui/Param.py77
-rw-r--r--grc/gui/Platform.py7
-rw-r--r--grc/gui/Port.py3
-rw-r--r--grc/gui/Preferences.py5
-rw-r--r--grc/gui/PropsDialog.py128
-rw-r--r--grc/python/Constants.py5
-rw-r--r--grc/python/Param.py44
-rw-r--r--grc/python/Platform.py15
-rw-r--r--grc/python/block.dtd7
-rw-r--r--volk/lib/qa_utils.cc29
173 files changed, 12603 insertions, 1860 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61a3762dbe..9803104d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
# Set the version information here
set(VERSION_INFO_MAJOR_VERSION 3)
set(VERSION_INFO_API_COMPAT 7)
-set(VERSION_INFO_MINOR_VERSION 3)
-set(VERSION_INFO_MAINT_VERSION 0)
+set(VERSION_INFO_MINOR_VERSION 4)
+set(VERSION_INFO_MAINT_VERSION git)
include(GrVersion) #setup version info
# Append -O2 optimization flag for Debug builds
diff --git a/README.building-boost b/README.building-boost
index a281e8bd78..eea4df3889 100644
--- a/README.building-boost
+++ b/README.building-boost
@@ -6,6 +6,29 @@ If running a distribution that requires boost 1.35 (or later) be built
from scratch, these instructions explain how to do so, and in a way
that allows it to peacefully coexist with earlier versions of boost.
+There are two recommended methods:
+Installing boost using the PyBOMBS utility, or building it from a source
+tarball.
+
+1. Installing Boost using ByBOMBS
+---------------------------------
+
+Following http://gnuradio.org/redmine/projects/pybombs/wiki/Using you can
+install a recent boost by downloading and executing the PyBombs utility:
+
+# go to a directory you have write access to
+$ git clone git://github.com/pybombs/pybombs
+$ cd pybombs
+$ ./pybombs install boost
+
+The utility will take care of everything from thereon, install it from a
+package source if a recent version is available for your system or build
+it from source if necessary.
+
+
+2. Building Boost from a source tarball
+---------------------------------------
+
Download the latest version of boost from boost.sourceforge.net.
(boost_1_49_0.tar.bz2 was the latest when this was written). Different
Boost versions often have different installations. If these
@@ -36,7 +59,7 @@ required will just save compilation time.
Installing GNU Radio with new Boost libraries.
-Tell cmake to look for the Boost libraries and header files in the new location with the folloing command:
+Tell Cmake to look for the Boost libraries and header files in the new location with the following command:
$ cd <build directory>
$ cmake -DBOOST_ROOT=$BOOST_PREFIX -DBoost_INCLUDE_DIR=$BOOST_PREFIX/include/boost-1_49/ -DBoost_LIBRARY_DIRS=$BOOST_PREFIX/lib <path to gnuradio source tree>
diff --git a/README.hacking b/README.hacking
index c22e00991d..21140ebeea 100644
--- a/README.hacking
+++ b/README.hacking
@@ -26,34 +26,32 @@ aren't done differently, etc, etc,
* Boost 1.35
-Until boost 1.35 or later is common in distributions, you'll need to
-build boost from source yourself. See README.building-boost.
-
+Boost 1.35 and later is fairly common in modern distributions.
+If it isn't available for your system, please refer to
+README.building-boost for instructions
* C++ and Python
-GNU Radio is now a hybrid system. Some parts of the system are built
-in C++ and some of it in Python. In general, prefer Python to C++.
-Signal processing primitives are still built in C++ for performance.
+GNU Radio is a hybrid system. Some parts of the system are built
+in C++ and some of it in Python. In general, prefer Python to C++ for
+its simplicity; for performance-critical and system-related
+functionality. Signal processing primitives are still built in C++ for
+performance; the Vector-Optimized Library of Kernels (VOLK) is directly
+accessible from C++.
* C++ namespaces
-In the cleanup process, I considered putting everything in the
-gnuradio namespace and dropping the Gr|gr prefix. In fact, I think
-it's probably the right idea, but when I tested it out, I ran into
-problems with SWIG's handling of namespaces. Bottom line, SWIG
-(1.3.21) got confused and generated bad code when I started playing
-around with namespaces in a not particularly convoluted way. I saw
-problems using the boost::shared_ptr template in combination with
-classes defined in the gnuradio namespace. It wasn't pretty...
-
+GNU Radio is organized in modules. For example, the blocks of the gr-digital
+module reside in the namespace gr::digital. Out-Of-Tree modules follow the
+same convention, but should take care not to clash with the official modules.
* Naming conventions
Death to CamelCaseNames! We've returned to a kinder, gentler era.
We're now using the "STL style" naming convention with a couple of
-modifications since we're not using namespaces.
+modifications. Refer to the classes in the official source tree for
+examples.
With the exception of macros and other constant values, all
identifiers shall be lower case with words_separated_like_this.
@@ -62,50 +60,22 @@ Macros and constant values (e.g., enumerated values,
static const int FOO = 23) shall be in UPPER_CASE.
-** Global names
-
-All globally visible names (types, functions, variables, consts, etc)
-shall begin with a "package prefix", followed by an '_'. The bulk of
-the code in GNU Radio logically belongs to the "gr" package, hence
-names look like gr_open_file (...).
-
-Large coherent bodies of code may use other package prefixes, but
-let's try to keep them to a well thought out list. See the list
-below.
-
-*** Package prefixes
-
-These are the current package prefixes:
-
- gr_ Almost everything
-
- gri_ Implementation primitives. Sometimes we
- have both a gr_<foo> and a gri_<foo>. In that case,
- gr_<foo> would be derived from gr_block and gri_<foo>
- would be the low level guts of the function.
-
- atsc_ Code related to the Advanced Television
- Standards Committee HDTV implementation
-
- qa_ Quality Assurance. Test code.
-
-
** Class data members (instance variables)
All class data members shall begin with d_<foo>.
-The big win is when you're staring at a block of code it's obvious
+The big benefit is when you're staring at a block of code it's obvious
which of the things being assigned to persist outside of the block.
This also keeps you from having to be creative with parameter names
for methods and constructors. You just use the same name as the
instance variable, without the d_.
-class gr_wonderfulness {
+class wonderfulness {
std::string d_name;
double d_wonderfulness_factor;
public:
- gr_wonderfulness (std::string name, double wonderfulness_factor)
+ wonderfulness (std::string name, double wonderfulness_factor)
: d_name (name), d_wonderfulness_factor (wonderfulness_factor)
{
...
@@ -121,11 +91,7 @@ All class static data members shall begin with s_<foo>.
** File names
-Each significant class shall be contained in it's own file. The
-declaration of class gr_foo shall be in gr_foo.h, the definition in
-gr_foo.cc.
-
-
+Each significant class shall be contained in it's own file.
* Storage management
@@ -141,26 +107,13 @@ See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
* Unit tests
-Build unit tests for everything non-trivial and run them after every
-change. Check out Extreme Programming:
-http://c2.com/cgi/wiki?ExtremeProgrammingRoadmap
-
-Unit tests should also be written for all examples. This should kill
-off the bit rot we've been plagued with.
-
-** C++ unit tests
-
-For C++ we're using the cppunit framework. cppunit has its bad
-smells, but it's mostly workable. http://cppunit.sf.net
-
-Currently each directory <dirname>/lib contains files qa_<dirname>.{h,cc}
-that bring together all the qa_<foo> test suites in the directory.
-
-
-** Python unit tests
-
-We use the standard unittest package for unit testing of Python code.
+Unit tests are a useful tool for development -- they are less of a tool
+to prove others that you can write code that works like you defined it but help
+you and later maintainers identify corner cases, regressions and other malfunctions
+of code.
+GNU Radio has integrated versatile, easy to use testing facilities. Please refer to
+http://gnuradio.org/redmine/projects/gnuradio/wiki/Coding_guide_impl#Unit-testing
* Standard command line options
@@ -171,7 +124,10 @@ and long) and types of the arguments. We list them below using the
Python optparse syntax. In general, the default value should be coded
into the help string using the "... [default=%default]" syntax.
-** Mandatory options by gr_block
+** Mandatory options by gr::block
+
+When designing flow graphs with the GNU Radio Companion, appropriate
+option parsing will automatically be set up for you.
*** Audio source
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index 82f0780deb..1a246c8a62 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -39,13 +39,13 @@ if(QWT_INCLUDE_DIRS)
QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
- string(COMPARE GREATER ${QWT_VERSION} "6.1.2" QWT_WRONG_VERSION)
+ string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
message(STATUS "QWT Version: ${QWT_VERSION}")
if(NOT QWT_WRONG_VERSION)
set(QWT_FOUND TRUE)
else(NOT QWT_WRONG_VERSION)
- message(STATUS "QWT Version must be >= 5.2 and <= 6.0.2, Found ${QWT_VERSION}")
+ message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
endif(NOT QWT_WRONG_VERSION)
endif(QWT_INCLUDE_DIRS)
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
index 3dc58bfaf4..6afecbd1bf 100644
--- a/docs/doxygen/Doxyfile.in
+++ b/docs/doxygen/Doxyfile.in
@@ -1,14 +1,16 @@
-# Doxyfile 1.5.7.1
+# Doxyfile 1.8.4
# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed
+# in front of the TAG it is preceding .
+# All text after a hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists items can also be appended using:
# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
#---------------------------------------------------------------------------
# Project related configuration options
@@ -22,16 +24,30 @@
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
-PROJECT_NAME = "GNU Radio @VERSION@ C++ API"
+PROJECT_NAME = "GNU Radio Manual and C++ API Reference"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER = "@VERSION@"
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF = "The Free & Open Software Radio Ecosystem"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO = @CMAKE_SOURCE_DIR@/docs/doxygen/gnuradio_logo_icon.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -54,11 +70,11 @@ CREATE_SUBDIRS = NO
# information to generate all constant output in the proper language.
# The default language is English, other supported languages are:
# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
-# Spanish, Swedish, and Ukrainian.
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -112,7 +128,9 @@ FULL_PATH_NAMES = NO
# only done if one of the specified strings matches the left-hand part of
# the path. The tag can be used to show relative paths in the file list.
# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
STRIP_FROM_PATH =
@@ -146,7 +164,7 @@ STRIP_FROM_INC_PATH = @CMAKE_SOURCE_DIR@/gnuradio-runtime/include \
@CMAKE_SOURCE_DIR@/volk/include
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# (but less readable) file names. This can be useful if your file system
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
@@ -201,6 +219,13 @@ TAB_SIZE = 8
ALIASES =
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
# For instance, some of the names that are used will be different. The list
@@ -227,11 +252,40 @@ OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT = YES
+
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# func(std::string) {}). This also makes the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = YES
@@ -247,10 +301,10 @@ CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
@@ -271,6 +325,22 @@ DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields or simple typedef fields will be shown
+# inline in the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO (the default), structs, classes, and unions are shown on a separate
+# page (for HTML and Man pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
# is documented as struct, union, or enum with the name of the typedef. So
# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
@@ -281,21 +351,16 @@ SUBGROUPING = YES
TYPEDEF_HIDES_STRUCT = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 4
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can
+# be an expensive process and often the same symbol appear multiple times in
+# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
+# small doxygen will become slower. If the cache is too large, memory is wasted.
+# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
+# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
+# symbols.
+
+LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
@@ -304,7 +369,7 @@ SYMBOL_CACHE_SIZE = 4
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
# documentation are documented, even if no documentation was available.
# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
@@ -313,6 +378,11 @@ EXTRACT_ALL = YES
EXTRACT_PRIVATE = NO
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
@@ -335,7 +405,7 @@ EXTRACT_LOCAL_METHODS = NO
# extracted and appear in the documentation as a namespace called
# 'anonymous_namespace{file}', where file will be replaced with the base
# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# anonymous namespaces are hidden.
EXTRACT_ANON_NSPACES = NO
@@ -395,6 +465,12 @@ HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
@@ -414,6 +490,16 @@ SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
# hierarchy of group names into alphabetical order. If set to NO (the default)
# the group names will appear in their defined order.
@@ -430,6 +516,15 @@ SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
# The GENERATE_TODOLIST tag can be used to enable (YES) or
# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
@@ -455,15 +550,16 @@ GENERATE_BUGLIST = NO
GENERATE_DEPRECATEDLIST= NO
# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
+# the initial value of a variable or macro consists of for it to appear in
# the documentation. If the initializer consists of more lines than specified
# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
+# The appearance of the initializer of individual variables and macros in the
# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
@@ -482,7 +578,8 @@ SHOW_USED_FILES = YES
SHOW_FILES = YES
# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page. This will remove the Namespaces entry from the Quick Index
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
# and from the Folder Tree View (if specified). The default is YES.
SHOW_NAMESPACES = YES
@@ -497,15 +594,26 @@ SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
LAYOUT_FILE =
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -534,7 +642,7 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
# functions that are documented, but have no documentation for their parameters
# or return value. If set to NO (the default) doxygen will only warn about
# wrong or incomplete parameter documentation, but not about the absence of
@@ -566,7 +674,8 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @top_srcdir@ @top_builddir@
+INPUT = @top_srcdir@ \
+ @top_builddir@
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -580,8 +689,9 @@ INPUT_ENCODING = UTF-8
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
FILE_PATTERNS = *.h \
*.dox
@@ -592,12 +702,14 @@ FILE_PATTERNS = *.h \
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
EXCLUDE = @abs_top_builddir@/docs/doxygen/html \
- @abs_top_builddir@/docs/doxygen/xml \
+ @abs_top_builddir@/docs/doxygen/xml \
@abs_top_builddir@/docs/doxygen/other/doxypy.py \
@abs_top_builddir@/dtools \
@abs_top_builddir@/gnuradio-runtime/lib/runtime/gr_error_handler.cc \
@@ -616,7 +728,7 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \
@abs_top_builddir@/gr-video-sdl/swig/video_sdl_swig.py \
@abs_top_builddir@/gr-wxgui/python \
@abs_top_builddir@/grc \
- @abs_top_builddir@/_CPack_Packages \
+ @abs_top_builddir@/_CPack_Packages \
@abs_top_srcdir@/cmake \
@abs_top_srcdir@/gr-utils/python/modtool/gr-newmod \
@abs_top_srcdir@/docs/doxygen/doxyxml/example \
@@ -664,8 +776,8 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \
@abs_top_srcdir@/gr-wxgui/lib \
@abs_top_builddir@/gr-wxgui/lib
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
@@ -743,17 +855,22 @@ IMAGE_PATH = @abs_top_srcdir@/docs/doxygen/images/
# by executing (via popen()) the command <filter> <input-file>, where <filter>
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be ignored.
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
INPUT_FILTER =
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
FILTER_PATTERNS = *.py=@top_srcdir@/docs/doxygen/other/doxypy.py
@@ -763,6 +880,21 @@ FILTER_PATTERNS = *.py=@top_srcdir@/docs/doxygen/other/doxypy.py
FILTER_SOURCE_FILES = NO
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
@@ -781,7 +913,7 @@ INLINE_SOURCES = NO
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
STRIP_CODE_COMMENTS = NO
@@ -800,7 +932,8 @@ REFERENCES_RELATION = YES
# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentstion.
+# link to the source code.
+# Otherwise they will link to the documentation.
REFERENCES_LINK_SOURCE = YES
@@ -864,7 +997,14 @@ HTML_FILE_EXTENSION = .html
# The HTML_HEADER tag can be used to specify a personal HTML header for
# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
HTML_HEADER =
@@ -876,21 +1016,80 @@ HTML_FOOTER =
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
HTML_STYLESHEET =
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
+
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
HTML_DYNAMIC_SECTIONS = NO
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
# If the GENERATE_DOCSET tag is set to YES, additional index files
# will be generated that can be used as input for Apple's Xcode 3
# integrated development environment, introduced with OSX 10.5 (Leopard).
@@ -899,7 +1098,8 @@ HTML_DYNAMIC_SECTIONS = NO
# directory and running "make install" will install the docset in
# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
GENERATE_DOCSET = NO
@@ -917,6 +1117,16 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
DOCSET_BUNDLE_ID = org.doxygen.Project
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
@@ -961,10 +1171,10 @@ BINARY_TOC = NO
TOC_EXPAND = YES
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
GENERATE_QHP = NO
@@ -976,57 +1186,99 @@ QCH_FILE =
# The QHP_NAMESPACE tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
+# http://doc.trolltech.com/qthelpproject.html#namespace
QHP_NAMESPACE = org.doxygen.Project
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
QHP_VIRTUAL_FOLDER = doc
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
# be used to specify the location of Qt's qhelpgenerator.
# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file .
+# .qhp file.
QHG_LOCATION =
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
-DISABLE_INDEX = YES
+GENERATE_ECLIPSEHELP = NO
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
-ENUM_VALUES_PER_LINE = 4
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = YES
# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
# structure should be generated to display hierarchical information.
-# If the tag value is set to FRAME, a side panel will be generated
+# If the tag value is set to YES, a side panel will be generated
# containing a tree-like index structure (just like the one that
# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature. Other possible values
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list;
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
-# disables this behavior completely. For backwards compatibility with previous
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
-# respectively.
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
GENERATE_TREEVIEW = YES
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 180
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
# Use this tag to change the font size of Latex formulas included
# as images in the HTML documentation. The default is 10. Note that
# when you change the font size after a successful doxygen run you need
@@ -1035,6 +1287,112 @@ TREEVIEW_WIDTH = 180
FORMULA_FONTSIZE = 10
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
+# pieces of code that will be used on startup of the MathJax code.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search
+# engine library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS =
+
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
@@ -1052,6 +1410,9 @@ LATEX_OUTPUT = latex
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
LATEX_CMD_NAME = latex
@@ -1068,8 +1429,8 @@ MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4 will be used.
PAPER_TYPE = letter
@@ -1085,6 +1446,20 @@ EXTRA_PACKAGES =
LATEX_HEADER =
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
+# or other source files which should be copied to the LaTeX output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
+
+LATEX_EXTRA_FILES =
+
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
# contain links (just like the HTML output) instead of page references
@@ -1111,6 +1486,19 @@ LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -1142,7 +1530,7 @@ COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
@@ -1217,6 +1605,21 @@ XML_DTD =
XML_PROGRAMLISTING = NO
#---------------------------------------------------------------------------
+# configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
+# that can be used to generate PDF.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it. If left blank docbook will be used as the default path.
+
+DOCBOOK_OUTPUT = docbook
+
+#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
@@ -1247,8 +1650,10 @@ GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
# tag is set to NO the size of the Perl module output will be much smaller
# and Perl will parse it just the same.
@@ -1285,7 +1690,7 @@ MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
SEARCH_INCLUDES = YES
@@ -1315,15 +1720,15 @@ PREDEFINED =
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
SKIP_FUNCTION_MACROS = YES
@@ -1331,20 +1736,18 @@ SKIP_FUNCTION_MACROS = YES
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-# TAGFILES = file1 file2 ...
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
TAGFILES =
@@ -1365,6 +1768,12 @@ ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
+# in the related pages index. If set to NO, only the current project's
+# pages will be listed.
+
+EXTERNAL_PAGES = YES
+
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
@@ -1377,9 +1786,8 @@ PERL_PATH = /usr/bin/perl
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
CLASS_DIAGRAMS = YES
@@ -1405,35 +1813,40 @@ HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = @HAVE_DOT@
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
-DOT_FONTNAME = FreeSans
+DOT_FONTNAME = Helvetica
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
DOT_FONTSIZE = 10
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
-CLASS_GRAPH = YES
+CLASS_GRAPH = NO
# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
@@ -1445,7 +1858,7 @@ COLLABORATION_GRAPH = NO
# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for groups, showing the direct groups dependencies
-GROUP_GRAPHS = YES
+GROUP_GRAPHS = NO
# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
# collaboration diagrams in a style similar to the OMG's Unified Modeling
@@ -1453,6 +1866,15 @@ GROUP_GRAPHS = YES
UML_LOOK = NO
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# manageable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
@@ -1489,23 +1911,34 @@ CALL_GRAPH = NO
CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# will generate a graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
-DIRECTORY_GRAPH = YES
+DIRECTORY_GRAPH = NO
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
DOT_IMAGE_FORMAT = png
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1517,6 +1950,12 @@ DOT_PATH =
DOTFILE_DIRS =
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
@@ -1563,12 +2002,3 @@ GENERATE_LEGEND = YES
# the various graphs.
DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = NO
diff --git a/docs/doxygen/Doxyfile.swig_doc.in b/docs/doxygen/Doxyfile.swig_doc.in
index c1423b30c2..37a4d2a710 100644
--- a/docs/doxygen/Doxyfile.swig_doc.in
+++ b/docs/doxygen/Doxyfile.swig_doc.in
@@ -1,14 +1,16 @@
-# Doxyfile 1.6.1
+# Doxyfile 1.8.4
# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed
+# in front of the TAG it is preceding .
+# All text after a hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists items can also be appended using:
# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
#---------------------------------------------------------------------------
# Project related configuration options
@@ -22,8 +24,9 @@
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
PROJECT_NAME = @CPACK_PACKAGE_NAME@
@@ -33,6 +36,19 @@ PROJECT_NAME = @CPACK_PACKAGE_NAME@
PROJECT_NUMBER = @CPACK_PACKAGE_VERSION@
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
@@ -56,9 +72,9 @@ CREATE_SUBDIRS = NO
# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -112,7 +128,9 @@ FULL_PATH_NAMES = YES
# only done if one of the specified strings matches the left-hand part of
# the path. The tag can be used to show relative paths in the file list.
# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
STRIP_FROM_PATH =
@@ -126,7 +144,7 @@ STRIP_FROM_PATH =
STRIP_FROM_INC_PATH =
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# (but less readable) file names. This can be useful if your file system
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
@@ -181,6 +199,13 @@ TAB_SIZE = 8
ALIASES =
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
# For instance, some of the names that are used will be different. The list
@@ -207,22 +232,40 @@ OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
EXTENSION_MAPPING =
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT = YES
+
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# func(std::string) {}). This also makes the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = YES
@@ -238,10 +281,10 @@ CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
@@ -262,6 +305,22 @@ DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields or simple typedef fields will be shown
+# inline in the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO (the default), structs, classes, and unions are shown on a separate
+# page (for HTML and Man pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
# is documented as struct, union, or enum with the name of the typedef. So
# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
@@ -272,21 +331,16 @@ SUBGROUPING = YES
TYPEDEF_HIDES_STRUCT = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can
+# be an expensive process and often the same symbol appear multiple times in
+# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
+# small doxygen will become slower. If the cache is too large, memory is wasted.
+# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
+# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
+# symbols.
+
+LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
@@ -295,7 +349,7 @@ SYMBOL_CACHE_SIZE = 0
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
# documentation are documented, even if no documentation was available.
# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
@@ -304,6 +358,11 @@ EXTRACT_ALL = YES
EXTRACT_PRIVATE = NO
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
@@ -326,7 +385,7 @@ EXTRACT_LOCAL_METHODS = NO
# extracted and appear in the documentation as a namespace called
# 'anonymous_namespace{file}', where file will be replaced with the base
# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# anonymous namespaces are hidden.
EXTRACT_ANON_NSPACES = NO
@@ -386,6 +445,12 @@ HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
@@ -405,7 +470,13 @@ SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
SORT_MEMBERS_CTORS_1ST = NO
@@ -425,6 +496,15 @@ SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
# The GENERATE_TODOLIST tag can be used to enable (YES) or
# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
@@ -450,15 +530,16 @@ GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
+# the initial value of a variable or macro consists of for it to appear in
# the documentation. If the initializer consists of more lines than specified
# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
+# The appearance of the initializer of individual variables and macros in the
# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
@@ -493,15 +574,26 @@ SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
LAYOUT_FILE =
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -530,7 +622,7 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
# functions that are documented, but have no documentation for their parameters
# or return value. If set to NO (the default) doxygen will only warn about
# wrong or incomplete parameter documentation, but not about the absence of
@@ -576,8 +668,9 @@ INPUT_ENCODING = UTF-8
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
FILE_PATTERNS = *.h
@@ -587,14 +680,16 @@ FILE_PATTERNS = *.h
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
-EXCLUDE =
+EXCLUDE =
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
@@ -647,8 +742,10 @@ IMAGE_PATH =
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
# input file. Doxygen will then use the output that the filter program writes
# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# If FILTER_PATTERNS is specified, this tag will be ignored.
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
INPUT_FILTER =
@@ -658,8 +755,8 @@ INPUT_FILTER =
# filter if there is a match.
# The filters are a list of the form:
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
FILTER_PATTERNS =
@@ -669,6 +766,21 @@ FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
@@ -687,7 +799,7 @@ INLINE_SOURCES = NO
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
STRIP_CODE_COMMENTS = YES
@@ -771,7 +883,14 @@ HTML_FILE_EXTENSION = .html
# The HTML_HEADER tag can be used to specify a personal HTML header for
# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
HTML_HEADER =
@@ -783,21 +902,80 @@ HTML_FOOTER =
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
HTML_STYLESHEET =
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
+
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
HTML_DYNAMIC_SECTIONS = NO
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
# If the GENERATE_DOCSET tag is set to YES, additional index files
# will be generated that can be used as input for Apple's Xcode 3
# integrated development environment, introduced with OSX 10.5 (Leopard).
@@ -806,7 +984,8 @@ HTML_DYNAMIC_SECTIONS = NO
# directory and running "make install" will install the docset in
# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
GENERATE_DOCSET = NO
@@ -824,6 +1003,16 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
DOCSET_BUNDLE_ID = org.doxygen.Project
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
@@ -868,10 +1057,10 @@ BINARY_TOC = NO
TOC_EXPAND = NO
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
GENERATE_QHP = NO
@@ -893,20 +1082,24 @@ QHP_NAMESPACE =
QHP_VIRTUAL_FOLDER = doc
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
# http://doc.trolltech.com/qthelpproject.html#custom-filters
QHP_CUST_FILTER_NAME =
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
QHP_CUST_FILTER_ATTRS =
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
QHP_SECT_FILTER_ATTRS =
@@ -917,16 +1110,30 @@ QHP_SECT_FILTER_ATTRS =
QHG_LOCATION =
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
-DISABLE_INDEX = NO
+GENERATE_ECLIPSEHELP = NO
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
-ENUM_VALUES_PER_LINE = 4
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = NO
# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
# structure should be generated to display hierarchical information.
@@ -935,15 +1142,29 @@ ENUM_VALUES_PER_LINE = 4
# is generated for HTML Help). For this to work a browser that supports
# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
GENERATE_TREEVIEW = NO
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 250
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
# Use this tag to change the font size of Latex formulas included
# as images in the HTML documentation. The default is 10. Note that
# when you change the font size after a successful doxygen run you need
@@ -952,13 +1173,112 @@ TREEVIEW_WIDTH = 250
FORMULA_FONTSIZE = 10
-# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
+# pieces of code that will be used on startup of the MathJax code.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
SEARCHENGINE = YES
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search
+# engine library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS =
+
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
@@ -976,6 +1296,9 @@ LATEX_OUTPUT = latex
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
LATEX_CMD_NAME = latex
@@ -992,8 +1315,8 @@ MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4 will be used.
PAPER_TYPE = a4wide
@@ -1009,6 +1332,20 @@ EXTRA_PACKAGES =
LATEX_HEADER =
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
+# or other source files which should be copied to the LaTeX output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
+
+LATEX_EXTRA_FILES =
+
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
# contain links (just like the HTML output) instead of page references
@@ -1035,10 +1372,19 @@ LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
LATEX_SOURCE_CODE = NO
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -1070,7 +1416,7 @@ COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
@@ -1145,6 +1491,21 @@ XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
+# configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
+# that can be used to generate PDF.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it. If left blank docbook will be used as the default path.
+
+DOCBOOK_OUTPUT = docbook
+
+#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
@@ -1215,7 +1576,7 @@ MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = NO
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
SEARCH_INCLUDES = YES
@@ -1245,15 +1606,15 @@ PREDEFINED =
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
SKIP_FUNCTION_MACROS = YES
@@ -1261,22 +1622,18 @@ SKIP_FUNCTION_MACROS = YES
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
#
# TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows:
#
# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
TAGFILES =
@@ -1297,6 +1654,12 @@ ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
+# in the related pages index. If set to NO, only the current project's
+# pages will be listed.
+
+EXTERNAL_PAGES = YES
+
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
@@ -1309,11 +1672,10 @@ PERL_PATH = /usr/bin/perl
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
-CLASS_DIAGRAMS = YES
+CLASS_DIAGRAMS = NO
# You can define message sequence charts within doxygen comments using the \msc
# command. Doxygen will then run the mscgen tool (see
@@ -1337,33 +1699,38 @@ HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
-DOT_FONTNAME = FreeSans
+DOT_FONTNAME =
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
DOT_FONTSIZE = 10
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
@@ -1385,6 +1752,15 @@ GROUP_GRAPHS = YES
UML_LOOK = NO
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# manageable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
@@ -1421,11 +1797,11 @@ CALL_GRAPH = NO
CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# will generate a graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
@@ -1433,11 +1809,22 @@ GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
DOT_IMAGE_FORMAT = png
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1449,6 +1836,12 @@ DOT_PATH =
DOTFILE_DIRS =
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
diff --git a/docs/doxygen/gnuradio_logo_icon.png b/docs/doxygen/gnuradio_logo_icon.png
new file mode 100644
index 0000000000..c9308fed17
--- /dev/null
+++ b/docs/doxygen/gnuradio_logo_icon.png
Binary files differ
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h
index a0c9e4f09d..6cd84ae7e5 100644
--- a/gnuradio-runtime/include/gnuradio/thread/thread.h
+++ b/gnuradio-runtime/include/gnuradio/thread/thread.h
@@ -149,6 +149,9 @@ namespace gr {
* Note: this does not work on OSX
*/
GR_RUNTIME_API int set_thread_priority(gr_thread_t thread, int priority);
+
+ GR_RUNTIME_API void set_thread_name(gr_thread_t thread,
+ std::string name);
} /* namespace thread */
} /* namespace gr */
diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc
index f3f7783839..a9907cabe1 100644
--- a/gnuradio-runtime/lib/pmt/pmt.cc
+++ b/gnuradio-runtime/lib/pmt/pmt.cc
@@ -942,8 +942,7 @@ msg_accepter_ref(const pmt_t &obj)
bool
is_blob(pmt_t x)
{
- // return is_u8vector(x);
- return is_uniform_vector(x);
+ return is_u8vector(x);
}
pmt_t
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc
index 5e5874ec0f..53eb23b2f0 100644
--- a/gnuradio-runtime/lib/thread/thread.cc
+++ b/gnuradio-runtime/lib/thread/thread.cc
@@ -24,6 +24,7 @@
#endif
#include <gnuradio/thread/thread.h>
+#include <boost/format.hpp>
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
@@ -110,6 +111,41 @@ namespace gr {
// Not implemented on Windows
return -1;
}
+#pragma pack(push,8)
+ typedef struct tagTHREADNAME_INFO
+ {
+ DWORD dwType; // Must be 0x1000
+ LPCSTR szName; // Pointer to name (in user addr space)
+ DWORD dwThreadID; // Thread ID (-1 = caller thread)
+ DWORD dwFlags; // Reserved for future use, must be zero
+ } THREADNAME_INFO;
+#pragma pack(pop)
+ void
+ set_thread_name(gr_thread_t thread, std::string name)
+ {
+ const DWORD SET_THREAD_NAME_EXCEPTION = 0x406D1388;
+
+ DWORD dwThreadId = GetThreadId(thread);
+ if (dwThreadId == 0)
+ return;
+
+ if (name.empty())
+ name = boost::str(boost::format("thread %lu") % dwThreadId);
+
+ THREADNAME_INFO info;
+ info.dwType = 0x1000;
+ info.szName = name.c_str();
+ info.dwThreadID = dwThreadId;
+ info.dwFlags = 0;
+
+ __try
+ {
+ RaiseException(SET_THREAD_NAME_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+ }
+ __except(EXCEPTION_EXECUTE_HANDLER)
+ {
+ }
+ }
} /* namespace thread */
} /* namespace gr */
@@ -177,6 +213,12 @@ namespace gr {
// Not implemented on OSX
return -1;
}
+
+ void
+ set_thread_name(gr_thread_t thread, std::string name)
+ {
+ // Not implemented on OSX
+ }
} /* namespace thread */
} /* namespace gr */
@@ -186,6 +228,7 @@ namespace gr {
#include <sstream>
#include <stdexcept>
#include <pthread.h>
+#include <sys/prctl.h>
namespace gr {
namespace thread {
@@ -283,6 +326,34 @@ namespace gr {
param.sched_priority = priority;
return pthread_setschedparam(thread, policy, &param);
}
+
+ void
+ set_thread_name(gr_thread_t thread, std::string name)
+ {
+ if (thread != pthread_self()) // Naming another thread is not supported
+ return;
+
+ if (name.empty())
+ name = boost::str(boost::format("thread %llu") % ((unsigned long long)thread));
+
+ const int max_len = 16; // Maximum accepted by PR_SET_NAME
+
+ if ((int)name.size() > max_len) // Shorten the name if necessary by taking as many characters from the front
+ { // so that the unique_id can still fit on the end
+ int i = name.size() - 1;
+ for (; i >= 0; --i)
+ {
+ std::string s = name.substr(i, 1);
+ int n = atoi(s.c_str());
+ if ((n == 0) && (s != "0"))
+ break;
+ }
+
+ name = name.substr(0, std::max(0, max_len - ((int)name.size() - (i + 1)))) + name.substr(i + 1);
+ }
+
+ prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
+ }
} /* namespace thread */
} /* namespace gr */
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc
index 7cdee6a097..79abd0e61d 100644
--- a/gnuradio-runtime/lib/tpb_thread_body.cc
+++ b/gnuradio-runtime/lib/tpb_thread_body.cc
@@ -36,6 +36,8 @@ namespace gr {
: d_exec(block, max_noutput_items)
{
//std::cerr << "tpb_thread_body: " << block << std::endl;
+
+ thread::set_thread_name(pthread_self(), boost::str(boost::format("%s%d") % block->name() % block->unique_id()));
block_detail *d = block->detail().get();
block_executor::state s;
diff --git a/gnuradio-runtime/python/pmt/pmt_to_python.py b/gnuradio-runtime/python/pmt/pmt_to_python.py
index e4797f9d44..3344eba163 100644
--- a/gnuradio-runtime/python/pmt/pmt_to_python.py
+++ b/gnuradio-runtime/python/pmt/pmt_to_python.py
@@ -63,13 +63,42 @@ def pmt_from_dict(p):
d = pmt.dict_add(d, python_to_pmt(k), python_to_pmt(v))
return d
-def numpy_to_blob(p):
- p = p.view(numpy.uint8)
- b = pmt.make_blob(len(p))
- pmt.blob_data(b)[:] = p
- return b
+numpy_mappings = {
+ numpy.dtype(numpy.float32): (pmt.init_f32vector, float, pmt.f32vector_elements, pmt.is_f32vector),
+ numpy.dtype(numpy.float64): (pmt.init_f64vector, float, pmt.f64vector_elements, pmt.is_f64vector),
+ numpy.dtype(numpy.complex64): (pmt.init_c32vector, complex, pmt.c32vector_elements, pmt.is_c32vector),
+ numpy.dtype(numpy.complex128): (pmt.init_c64vector, complex, pmt.c64vector_elements, pmt.is_c64vector),
+ numpy.dtype(numpy.int8): (pmt.init_s8vector, int, pmt.s8vector_elements, pmt.is_s8vector),
+ numpy.dtype(numpy.int16): (pmt.init_s16vector, int, pmt.s16vector_elements, pmt.is_s16vector),
+ numpy.dtype(numpy.int32): (pmt.init_s32vector, int, pmt.s32vector_elements, pmt.is_s32vector),
+# numpy.dtype(numpy.int64): (pmt.init_s64vector, int, pmt.s64vector_elements, pmt.is_s64vector),
+ numpy.dtype(numpy.uint8): (pmt.init_u8vector, int, pmt.u8vector_elements, pmt.is_u8vector),
+ numpy.dtype(numpy.uint16): (pmt.init_u16vector, int, pmt.u16vector_elements, pmt.is_u16vector),
+ numpy.dtype(numpy.uint32): (pmt.init_u32vector, int, pmt.u32vector_elements, pmt.is_u32vector),
+# numpy.dtype(numpy.uint64): (pmt.init_u64vector, int, pmt.u64vector_elements, pmt.is_u64vector),
+ numpy.dtype(numpy.byte): (pmt.init_u8vector, int, pmt.u8vector_elements, pmt.is_u8vector),
+}
-THE_TABLE = ( #python type, check pmt type, to python, from python
+uvector_mappings = dict([ (numpy_mappings[key][3], (numpy_mappings[key][2], key)) for key in numpy_mappings ])
+
+def numpy_to_uvector(numpy_array):
+ try:
+ mapping = numpy_mappings[numpy_array.dtype]
+ pc = map(mapping[1], numpy.ravel(numpy_array))
+ return mapping[0](numpy_array.size, pc)
+ except KeyError:
+ raise ValueError("unsupported numpy array dtype for converstion to pmt %s"%(numpy_array.dtype))
+
+def uvector_to_numpy(uvector):
+ match = None
+ for test_func in uvector_mappings.keys():
+ if test_func(uvector):
+ match = uvector_mappings[test_func]
+ return numpy.array(match[0](uvector), dtype = match[1])
+ else:
+ raise ValueError("unsupported uvector data type for conversion to numpy array %s"%(uvector))
+
+type_mappings = ( #python type, check pmt type, to python, from python
(None, pmt.is_null, lambda x: None, lambda x: pmt.PMT_NIL),
(bool, pmt.is_bool, pmt.to_bool, pmt.from_bool),
(str, pmt.is_symbol, pmt.symbol_to_string, pmt.string_to_symbol),
@@ -81,18 +110,18 @@ THE_TABLE = ( #python type, check pmt type, to python, from python
(tuple, pmt.is_tuple, pmt_to_tuple, pmt_from_tuple),
(list, pmt.is_vector, pmt_to_vector, pmt_from_vector),
(dict, pmt.is_dict, pmt_to_dict, pmt_from_dict),
- (numpy.ndarray, pmt.is_blob, pmt.blob_data, numpy_to_blob),
+ (numpy.ndarray, pmt.is_uniform_vector, uvector_to_numpy, numpy_to_uvector),
)
def pmt_to_python(p):
- for python_type, pmt_check, to_python, from_python in THE_TABLE:
+ for python_type, pmt_check, to_python, from_python in type_mappings:
if pmt_check(p): return to_python(p)
- return p #give up, we return the same
+ raise ValueError("can't convert %s type to pmt (%s)"%(type(p),p))
def python_to_pmt(p):
- for python_type, pmt_check, to_python, from_python in THE_TABLE:
+ for python_type, pmt_check, to_python, from_python in type_mappings:
if python_type is None:
if p == None: return from_python(p)
elif isinstance(p, python_type): return from_python(p)
- return p #give up, we return the same
+ raise ValueError("can't convert %s type to pmt (%s)"%(type(p),p))
diff --git a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
index ae86fc6d53..39cfc05dd6 100755
--- a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
+++ b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
@@ -22,13 +22,27 @@
import unittest
import pmt
+import pmt_to_python as pmt2py
class test_pmt_to_python(unittest.TestCase):
- def test01 (self):
+ def test_pmt_from_double(self):
b = pmt.from_double(123765)
self.assertEqual(pmt.to_python(b), 123765)
t = pmt.to_pmt(range(5))
+
+ def test_numpy_to_uvector_and_reverse(self):
+ import numpy as np
+ N = 100
+ narr = np.ndarray(N, dtype=np.complex128)
+ narr.real[:] = np.random.uniform(size=N)
+ narr.imag[:] = np.random.uniform(size=N)
+ uvector = pmt2py.numpy_to_uvector(narr)
+ nparr = pmt2py.uvector_to_numpy(uvector)
+ self.assertTrue(nparr.dtype==narr.dtype)
+ self.assertTrue(np.alltrue(nparr == narr))
+
+
if __name__ == '__main__':
unittest.main()
diff --git a/gr-blocks/grc/blocks_socket_pdu.xml b/gr-blocks/grc/blocks_socket_pdu.xml
index 1e897cfc4b..72dc38134c 100644
--- a/gr-blocks/grc/blocks_socket_pdu.xml
+++ b/gr-blocks/grc/blocks_socket_pdu.xml
@@ -8,7 +8,7 @@
<name>Socket PDU</name>
<key>blocks_socket_pdu</key>
<import>from gnuradio import blocks</import>
- <make>blocks.socket_pdu($type, $host, $port, $mtu)</make>
+ <make>blocks.socket_pdu($type, $host, $port, $mtu, $tcp_no_delay)</make>
<param>
<name>Type</name>
<key>type</key>
@@ -49,6 +49,31 @@
<value>10000</value>
<type>int</type>
</param>
+ <param>
+ <name>TCP No Delay</name>
+ <key>tcp_no_delay</key>
+ <value>False</value>
+ <type>enum</type>
+ <hide>
+#if (($type() == '"TCP_CLIENT"') or ($type() == '"TCP_SERVER"'))
+#if (str($tcp_no_delay()) == 'False')
+part
+#else
+none
+#end if
+#else
+all
+#end if
+</hide>
+ <option>
+ <name>Enabled</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>Disabled</name>
+ <key>False</key>
+ </option>
+ </param>
<sink>
<name>pdus</name>
<type>message</type>
@@ -59,4 +84,5 @@
<type>message</type>
<optional>1</optional>
</source>
+ <doc>For server modes, leave Host blank to bind to all interfaces (equivalent to 0.0.0.0).</doc>
</block>
diff --git a/gr-blocks/grc/blocks_throttle.xml b/gr-blocks/grc/blocks_throttle.xml
index 06f96b15cc..790e195750 100644
--- a/gr-blocks/grc/blocks_throttle.xml
+++ b/gr-blocks/grc/blocks_throttle.xml
@@ -58,6 +58,7 @@
<key>ignoretag</key>
<value>True</value>
<type>bool</type>
+ <hide>#if str($ignoretag()) == 'True' then 'part' else 'none'#</hide>
</param>
<check>$vlen &gt; 0</check>
<sink>
diff --git a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
index c8c4378c30..cd057725c1 100644
--- a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
@@ -32,6 +32,15 @@ namespace gr {
/*!
* \brief Converts a stream of bytes with 1 bit in the LSB to a
* byte with k relevent bits.
+ *
+ * This block takes in K bytes at a time, and uses the least significant
+ * bit to form a new byte.
+ *
+ * Example:
+ * k = 4
+ * in = [0,1,0,1, 0x81,0x00,0x00,0x00]
+ * out = [0x05, 0x08]
+ *
* \ingroup byte_operators_blk
*/
class BLOCKS_API pack_k_bits_bb : virtual public sync_decimator
diff --git a/gr-blocks/include/gnuradio/blocks/short_to_char.h b/gr-blocks/include/gnuradio/blocks/short_to_char.h
index de4df623a1..22a157d341 100644
--- a/gr-blocks/include/gnuradio/blocks/short_to_char.h
+++ b/gr-blocks/include/gnuradio/blocks/short_to_char.h
@@ -31,6 +31,12 @@ namespace gr {
/*!
* \brief Convert stream of shorts to a stream of chars.
+ *
+ * This block strips off the least significant byte from the
+ * short value.
+ *
+ * [0x00ff, 0x0ff0, 0xff00] => [0x00, 0x0f, 0xff]
+ *
* \ingroup type_converters_blk
*/
class BLOCKS_API short_to_char : virtual public sync_block
diff --git a/gr-blocks/include/gnuradio/blocks/socket_pdu.h b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
index 82a7632e7b..31468a3f43 100644
--- a/gr-blocks/include/gnuradio/blocks/socket_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
@@ -45,8 +45,9 @@ namespace gr {
* \param addr network address to use
* \param port network port to use
* \param MTU maximum transmission unit
+ * \param tcp_no_delay TCP No Delay option (set to True to disable Nagle algorithm)
*/
- static sptr make(std::string type, std::string addr, std::string port, int MTU=10000);
+ static sptr make(std::string type, std::string addr, std::string port, int MTU=10000, bool tcp_no_delay=false);
};
} /* namespace blocks */
diff --git a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
index 926819502a..09d7ae912c 100644
--- a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
@@ -31,6 +31,14 @@ namespace gr {
/*!
* \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+ *
+ * This block picks the K least significant bits from a byte, and expands
+ * them into K bytes of 0 or 1.
+ *
+ * Example:
+ * k = 4
+ * in = [0xf5, 0x08]
+ * out = [0,1,0,1, 1,0,0,0]
* \ingroup byte_operators_blk
*/
class BLOCKS_API unpack_k_bits_bb : virtual public sync_interpolator
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index 9daf8c30c9..a467452c3f 100644
--- a/gr-blocks/lib/socket_pdu_impl.cc
+++ b/gr-blocks/lib/socket_pdu_impl.cc
@@ -33,41 +33,60 @@ namespace gr {
namespace blocks {
socket_pdu::sptr
- socket_pdu::make(std::string type, std::string addr, std::string port, int MTU)
+ socket_pdu::make(std::string type, std::string addr, std::string port, int MTU/*= 10000*/, bool tcp_no_delay/*= false*/)
{
- return gnuradio::get_initial_sptr(new socket_pdu_impl(type, addr, port, MTU));
+ return gnuradio::get_initial_sptr(new socket_pdu_impl(type, addr, port, MTU, tcp_no_delay));
}
- socket_pdu_impl::socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU)
- : block("socket_pdu",
- io_signature::make (0, 0, 0),
- io_signature::make (0, 0, 0))
+ socket_pdu_impl::socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU/*= 10000*/, bool tcp_no_delay/*= false*/)
+ : block("socket_pdu",
+ io_signature::make (0, 0, 0),
+ io_signature::make (0, 0, 0)),
+ d_tcp_no_delay(tcp_no_delay)
{
+ d_rxbuf.resize(MTU);
+
message_port_register_in(PDU_PORT_ID);
message_port_register_out(PDU_PORT_ID);
- if ((type == "TCP_SERVER") || (type == "TCP_CLIENT")) {
+ if ((type == "TCP_SERVER") && ((addr.empty()) || (addr == "0.0.0.0"))) { // Bind on all interfaces
+ int port_num = atoi(port.c_str());
+ if (port_num == 0)
+ throw std::invalid_argument("gr::blocks:socket_pdu: invalid port for TCP_SERVER");
+ d_tcp_endpoint = boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port_num);
+ }
+ else if ((type == "TCP_SERVER") || (type == "TCP_CLIENT")) {
boost::asio::ip::tcp::resolver resolver(d_io_service);
- boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), addr, port);
- d_tcp_endpoint = *resolver.resolve(query);
+ boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(),
+ addr, port,
+ boost::asio::ip::resolver_query_base::passive);
+ d_tcp_endpoint = *resolver.resolve(query);
}
-
- if ((type == "UDP_SERVER") || (type == "UDP_CLIENT")) {
- boost::asio::ip::udp::resolver resolver(d_io_service);
- boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), addr, port);
+ else if ((type == "UDP_SERVER") && ((addr.empty()) || (addr == "0.0.0.0"))) { // Bind on all interfaces
+ int port_num = atoi(port.c_str());
+ if (port_num == 0)
+ throw std::invalid_argument("gr::blocks:socket_pdu: invalid port for UDP_SERVER");
+ d_udp_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), port_num);
+ }
+ else if ((type == "UDP_SERVER") || (type == "UDP_CLIENT")) {
+ boost::asio::ip::udp::resolver resolver(d_io_service);
+ boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(),
+ addr, port,
+ boost::asio::ip::resolver_query_base::passive);
if (type == "UDP_SERVER")
- d_udp_endpoint = *resolver.resolve(query);
+ d_udp_endpoint = *resolver.resolve(query);
else
- d_udp_endpoint_other = *resolver.resolve(query);
+ d_udp_endpoint_other = *resolver.resolve(query);
}
if (type == "TCP_SERVER") {
d_acceptor_tcp.reset(new boost::asio::ip::tcp::acceptor(d_io_service, d_tcp_endpoint));
d_acceptor_tcp->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+
start_tcp_accept();
+
set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::tcp_server_send, this, _1));
-
}
else if (type =="TCP_CLIENT") {
boost::system::error_code error = boost::asio::error::host_not_found;
@@ -75,34 +94,35 @@ namespace gr {
d_tcp_socket->connect(d_tcp_endpoint, error);
if (error)
throw boost::system::system_error(error);
+ d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay));
set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::tcp_client_send, this, _1));
- d_tcp_socket->async_read_some(
- boost::asio::buffer(d_rxbuf),
- boost::bind(&socket_pdu_impl::handle_tcp_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred)
- );
+ d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf),
+ boost::bind(&socket_pdu_impl::handle_tcp_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
else if (type =="UDP_SERVER") {
d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other,
- boost::bind(&socket_pdu_impl::handle_udp_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ boost::bind(&socket_pdu_impl::handle_udp_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
+
set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::udp_send, this, _1));
}
else if (type =="UDP_CLIENT") {
d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other,
- boost::bind(&socket_pdu_impl::handle_udp_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ boost::bind(&socket_pdu_impl::handle_udp_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
+
set_msg_handler(PDU_PORT_ID, boost::bind(&socket_pdu_impl::udp_send, this, _1));
}
else
- throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
+ throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
d_thread = gr::thread::thread(boost::bind(&socket_pdu_impl::run_io_service, this));
d_started = true;
@@ -112,14 +132,14 @@ namespace gr {
socket_pdu_impl::handle_tcp_read(const boost::system::error_code& error, size_t bytes_transferred)
{
if (!error) {
- pmt::pmt_t vector = pmt::init_u8vector(bytes_transferred, (const uint8_t *)&d_rxbuf[0]);
- pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector);
- message_port_pub(PDU_PORT_ID, pdu);
-
- d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf),
- boost::bind(&socket_pdu_impl::handle_tcp_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ pmt::pmt_t vector = pmt::init_u8vector(bytes_transferred, (const uint8_t *)&d_rxbuf[0]);
+ pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector);
+ message_port_pub(PDU_PORT_ID, pdu);
+
+ d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf),
+ boost::bind(&socket_pdu_impl::handle_tcp_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
else
throw boost::system::system_error(error);
@@ -128,11 +148,11 @@ namespace gr {
void
socket_pdu_impl::start_tcp_accept()
{
- tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service());
+ tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
d_acceptor_tcp->async_accept(new_connection->socket(),
- boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
- new_connection, boost::asio::placeholders::error));
+ boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
+ new_connection, boost::asio::placeholders::error));
}
void
@@ -147,12 +167,12 @@ namespace gr {
socket_pdu_impl::handle_tcp_accept(tcp_connection::sptr new_connection, const boost::system::error_code& error)
{
if (!error) {
- new_connection->start(this);
- d_tcp_connections.push_back(new_connection);
- start_tcp_accept();
+ new_connection->start(this);
+ d_tcp_connections.push_back(new_connection);
+ start_tcp_accept();
}
else
- std::cout << error << std::endl;
+ std::cout << error << std::endl;
}
void
@@ -160,22 +180,32 @@ namespace gr {
{
pmt::pmt_t vector = pmt::cdr(msg);
size_t len = pmt::length(vector);
- size_t offset(0);
- boost::array<char, 10000> txbuf;
- memcpy(&txbuf[0], pmt::uniform_vector_elements(vector, offset), len);
- d_tcp_socket->send(boost::asio::buffer(txbuf,len));
+ size_t offset = 0;
+ std::vector<char> txbuf(std::min(len, d_rxbuf.size()));
+ while (offset < len) {
+ size_t send_len = std::min((len - offset), txbuf.size());
+ memcpy(&txbuf[0], pmt::uniform_vector_elements(vector, offset), send_len);
+ offset += send_len;
+ d_tcp_socket->send(boost::asio::buffer(txbuf, send_len));
+ }
}
void
socket_pdu_impl::udp_send(pmt::pmt_t msg)
{
+ if (d_udp_endpoint_other.address().to_string() == "0.0.0.0")
+ return;
+
pmt::pmt_t vector = pmt::cdr(msg);
size_t len = pmt::length(vector);
- size_t offset(0);
- boost::array<char, 10000> txbuf;
- memcpy(&txbuf[0], pmt::uniform_vector_elements(vector, offset), len);
- if (d_udp_endpoint_other.address().to_string() != "0.0.0.0")
- d_udp_socket->send_to(boost::asio::buffer(txbuf,len), d_udp_endpoint_other);
+ size_t offset = 0;
+ std::vector<char> txbuf(std::min(len, d_rxbuf.size()));
+ while (offset < len) {
+ size_t send_len = std::min((len - offset), txbuf.size());
+ memcpy(&txbuf[0], pmt::uniform_vector_elements(vector, offset), send_len);
+ offset += send_len;
+ d_udp_socket->send_to(boost::asio::buffer(txbuf, send_len), d_udp_endpoint_other);
+ }
}
void
@@ -183,14 +213,14 @@ namespace gr {
{
if (!error) {
pmt::pmt_t vector = pmt::init_u8vector(bytes_transferred, (const uint8_t*)&d_rxbuf[0]);
- pmt::pmt_t pdu = pmt::cons( pmt::PMT_NIL, vector);
+ pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector);
message_port_pub(PDU_PORT_ID, pdu);
d_udp_socket->async_receive_from(boost::asio::buffer(d_rxbuf), d_udp_endpoint_other,
- boost::bind(&socket_pdu_impl::handle_udp_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ boost::bind(&socket_pdu_impl::handle_udp_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
}
diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h
index 3099d90e00..2d5bc33518 100644
--- a/gr-blocks/lib/socket_pdu_impl.h
+++ b/gr-blocks/lib/socket_pdu_impl.h
@@ -34,13 +34,14 @@ namespace gr {
{
private:
boost::asio::io_service d_io_service;
- boost::array<char, 10000> d_rxbuf;
+ std::vector<char> d_rxbuf;
void run_io_service() { d_io_service.run(); }
// TCP specific
boost::asio::ip::tcp::endpoint d_tcp_endpoint;
std::vector<tcp_connection::sptr> d_tcp_connections;
void handle_tcp_read(const boost::system::error_code& error, size_t bytes_transferred);
+ bool d_tcp_no_delay;
// TCP server specific
boost::shared_ptr<boost::asio::ip::tcp::acceptor> d_acceptor_tcp;
@@ -60,7 +61,7 @@ namespace gr {
void udp_send(pmt::pmt_t msg);
public:
- socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU);
+ socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU = 10000, bool tcp_no_delay = false);
};
} /* namespace blocks */
diff --git a/gr-blocks/lib/stream_mux_impl.cc b/gr-blocks/lib/stream_mux_impl.cc
index 1e42c2504f..698cf89d09 100644
--- a/gr-blocks/lib/stream_mux_impl.cc
+++ b/gr-blocks/lib/stream_mux_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2012 Free Software Foundation, Inc.
+ * Copyright 2012,2014 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -26,10 +26,8 @@
#include "stream_mux_impl.h"
#include <gnuradio/io_signature.h>
-#include <string.h>
-#include <cstdio>
-
-#define VERBOSE 0
+#include <boost/foreach.hpp>
+#include <cstring>
namespace gr {
namespace blocks {
@@ -48,8 +46,11 @@ namespace gr {
d_residual(0),
d_lengths(lengths)
{
- if(d_lengths[d_stream] == 0) {
- increment_stream();
+ while (d_lengths[d_stream] == 0) {
+ d_stream++;
+ if (d_stream == d_lengths.size()) {
+ throw std::invalid_argument("At least one size must be non-zero.");
+ }
}
d_residual = d_lengths[d_stream];
}
@@ -58,69 +59,57 @@ namespace gr {
stream_mux_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required)
{
unsigned ninputs = ninput_items_required.size ();
- for (unsigned i = 0; i < ninputs; i++)
- ninput_items_required[i] = (d_lengths[i] == 0 ? 0 : 1);
- }
-
- void
- stream_mux_impl::increment_stream()
- {
- do {
- d_stream = (d_stream+1) % d_lengths.size();
- } while(d_lengths[d_stream] == 0);
-
- d_residual = d_lengths[d_stream];
+ for (unsigned i = 0; i < ninputs; i++) {
+ // Only active inputs *need* items, for the rest, it would just be nice
+ ninput_items_required[i] = (d_stream == i ? 1 : 0);
+ }
}
int
stream_mux_impl::general_work(int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
- {
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items
+ ){
char *out = (char *) output_items[0];
const char *in;
- int out_index = 0;
- std::vector<int> input_index(d_lengths.size(), 0);
-
- if(VERBOSE) {
- printf("mux: nouput_items: %d d_stream: %d\n", noutput_items, d_stream);
- for(size_t i = 0; i < d_lengths.size(); i++)
- printf("\tninput_items[%zu]: %d\n", i, ninput_items[i]);
- }
-
- while (1) {
- int r = std::min(noutput_items - out_index,
- std::min(d_residual,
- ninput_items[d_stream] - input_index[d_stream]));
- if(VERBOSE) {
- printf("mux: r=%d\n", r);
- printf("\tnoutput_items - out_index: %d\n",
- noutput_items - out_index);
- printf("\td_residual: %d\n",
- d_residual);
- printf("\tninput_items[d_stream] - input_index[d_stream]: %d\n",
- ninput_items[d_stream] - input_index[d_stream]);
- }
-
- if(r <= 0) {
- return out_index;
- }
-
- in = (const char *) input_items[d_stream] + input_index[d_stream]*d_itemsize;
-
- memcpy(&out[out_index*d_itemsize], in, r*d_itemsize);
- out_index += r;
- input_index[d_stream] += r;
- d_residual -= r;
-
- consume(d_stream, r);
-
- if(d_residual == 0) {
- increment_stream();
- }
+ int out_index = 0; // Items written
+ gr_vector_int input_index(d_lengths.size(), 0); // Items read
+
+ while (out_index < noutput_items) {
+ if (ninput_items[d_stream] <= input_index[d_stream]) {
+ break;
+ }
+ int space_left_in_buffers = std::min(
+ noutput_items - out_index, // Space left in output buffer
+ ninput_items[d_stream] - input_index[d_stream] // Space left in input buffer
+ );
+ int items_to_copy = std::min(
+ space_left_in_buffers,
+ d_residual
+ );
+ in = (const char *) input_items[d_stream] + input_index[d_stream]*d_itemsize;
+ memcpy(&out[out_index*d_itemsize], in, items_to_copy*d_itemsize);
+ out_index += items_to_copy;
+ input_index[d_stream] += items_to_copy;
+ d_residual -= items_to_copy;
+ if (d_residual == 0) {
+ do { // Skip all those inputs with zero length
+ d_stream = (d_stream+1) % d_lengths.size();
+ } while (d_lengths[d_stream] == 0);
+ d_residual = d_lengths[d_stream];
+ } else {
+ break;
+ }
+ } // while
+
+ for (size_t i = 0; i < input_index.size(); i++) {
+ consume((int) i, input_index[i]);
}
- }
+
+ return out_index;
+ } /* work */
+
} /* namespace blocks */
} /* namespace gr */
diff --git a/gr-blocks/lib/stream_mux_impl.h b/gr-blocks/lib/stream_mux_impl.h
index 328eb0710e..67be9381af 100644
--- a/gr-blocks/lib/stream_mux_impl.h
+++ b/gr-blocks/lib/stream_mux_impl.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2012 Free Software Foundation, Inc.
+ * Copyright 2012,2014 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -36,10 +36,8 @@ namespace gr {
int d_residual; // number if items left to put into current stream
gr_vector_int d_lengths; // number if items to pack per stream
- void increment_stream();
-
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-
+
public:
stream_mux_impl(size_t itemsize, const std::vector<int> &lengths);
diff --git a/gr-blocks/lib/tcp_connection.cc b/gr-blocks/lib/tcp_connection.cc
index ce719d1843..970732e656 100644
--- a/gr-blocks/lib/tcp_connection.cc
+++ b/gr-blocks/lib/tcp_connection.cc
@@ -31,55 +31,69 @@
namespace gr {
namespace blocks {
- tcp_connection::sptr tcp_connection::make(boost::asio::io_service& io_service)
+ tcp_connection::sptr tcp_connection::make(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
{
- return sptr(new tcp_connection(io_service));
+ return sptr(new tcp_connection(io_service, MTU, no_delay));
}
- tcp_connection::tcp_connection(boost::asio::io_service& io_service)
+ tcp_connection::tcp_connection(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
: d_socket(io_service)
+ , d_block(NULL)
+ , d_no_delay(no_delay)
{
+ d_buf.resize(MTU);
+ try {
+ d_socket.set_option(boost::asio::ip::tcp::no_delay(no_delay));
+ }
+ catch (...) {
+ // Silently ignore failure (socket might be current in accept stage) and try again in 'start'
+ }
}
void
tcp_connection::send(pmt::pmt_t vector)
{
size_t len = pmt::length(vector);
- size_t offset(0);
- boost::array<char, 10000> txbuf;
- memcpy(&txbuf[0], pmt::uniform_vector_elements(vector, offset), len);
- boost::asio::async_write(d_socket, boost::asio::buffer(txbuf, len),
+ size_t offset = 0;
+ std::vector<char> txbuf(std::min(len, d_buf.size()));
+ while (offset < len) {
+ size_t send_len = std::min((len - offset), txbuf.size());
+ memcpy(&txbuf[0], pmt::uniform_vector_elements(vector, offset), send_len);
+ offset += send_len;
+ boost::asio::async_write(d_socket, boost::asio::buffer(txbuf, send_len),
boost::bind(&tcp_connection::handle_write, this,
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
+ }
}
void
tcp_connection::start(gr::basic_block *block)
{
d_block = block;
+ d_socket.set_option(boost::asio::ip::tcp::no_delay(d_no_delay));
d_socket.async_read_some(boost::asio::buffer(d_buf),
- boost::bind(&tcp_connection::handle_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ boost::bind(&tcp_connection::handle_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
void
tcp_connection::handle_read(const boost::system::error_code& error, size_t bytes_transferred)
{
if (!error) {
- pmt::pmt_t vector = pmt::init_u8vector(bytes_transferred, (const uint8_t*)&d_buf[0]);
- pmt::pmt_t pdu = pmt::cons( pmt::PMT_NIL, vector);
+ if (d_block) {
+ pmt::pmt_t vector = pmt::init_u8vector(bytes_transferred, (const uint8_t*)&d_buf[0]);
+ pmt::pmt_t pdu = pmt::cons(pmt::PMT_NIL, vector);
- d_block->message_port_pub(PDU_PORT_ID, pdu);
+ d_block->message_port_pub(PDU_PORT_ID, pdu);
+ }
d_socket.async_read_some(boost::asio::buffer(d_buf),
- boost::bind(&tcp_connection::handle_read, this,
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
-
+ boost::bind(&tcp_connection::handle_read, this,
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
}
-
} /* namespace blocks */
}/* namespace gr */
diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h
index f4d32fa90a..9193928c41 100644
--- a/gr-blocks/lib/tcp_connection.h
+++ b/gr-blocks/lib/tcp_connection.h
@@ -37,16 +37,16 @@ namespace gr {
{
private:
boost::asio::ip::tcp::socket d_socket;
- boost::array<char, 10000> d_buf;
- std::string d_message;
+ std::vector<char> d_buf;
basic_block *d_block;
+ bool d_no_delay;
- tcp_connection(boost::asio::io_service& io_service);
+ tcp_connection(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
public:
typedef boost::shared_ptr<tcp_connection> sptr;
- static sptr make(boost::asio::io_service& io_service);
+ static sptr make(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
boost::asio::ip::tcp::socket& socket() { return d_socket; };
diff --git a/gr-blocks/python/blocks/qa_stream_mux.py b/gr-blocks/python/blocks/qa_stream_mux.py
index 7abbced54c..00e32e955e 100755
--- a/gr-blocks/python/blocks/qa_stream_mux.py
+++ b/gr-blocks/python/blocks/qa_stream_mux.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004,2005,2007,2010,2012,2013 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2010,2012,2013,2014 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -167,5 +167,19 @@ class test_stream_mux (gr_unittest.TestCase):
self.assertEqual (exp_data, result_data)
+ def test_largeN_ff(self):
+ stream_sizes = [3, 8191]
+ r1 = (1,) * stream_sizes[0]
+ r2 = (2,) * stream_sizes[1]
+ v0 = blocks.vector_source_f(r1, repeat=False)
+ v1 = blocks.vector_source_f(r2, repeat=False)
+ mux = blocks.stream_mux(gr.sizeof_float, stream_sizes)
+ dst = blocks.vector_sink_f ()
+ self.tb.connect (v0, (mux,0))
+ self.tb.connect (v1, (mux,1))
+ self.tb.connect (mux, dst)
+ self.tb.run ()
+ self.assertEqual (r1 + r2, dst.data())
+
if __name__ == '__main__':
gr_unittest.run(test_stream_mux, "test_stream_mux.xml")
diff --git a/gr-digital/examples/demod/test_corr_and_sync.grc b/gr-digital/examples/demod/test_corr_and_sync.grc
index e0127878ad..8701690b88 100644
--- a/gr-digital/examples/demod/test_corr_and_sync.grc
+++ b/gr-digital/examples/demod/test_corr_and_sync.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Thu Nov 7 11:05:37 2013</timestamp>
+ <timestamp>Thu Apr 10 15:34:59 2014</timestamp>
<block>
<key>options</key>
<param>
@@ -64,7 +64,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>rrc_taps</value>
+ <value>samp_rate</value>
</param>
<param>
<key>_enabled</key>
@@ -72,11 +72,11 @@
</param>
<param>
<key>value</key>
- <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), eb, 5*sps*nfilts)</value>
+ <value>100000</value>
</param>
<param>
<key>_coordinate</key>
- <value>(1075, 73)</value>
+ <value>(11, 72)</value>
</param>
<param>
<key>_rotation</key>
@@ -87,7 +87,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>nfilts</value>
+ <value>eb</value>
</param>
<param>
<key>_enabled</key>
@@ -95,11 +95,11 @@
</param>
<param>
<key>value</key>
- <value>32</value>
+ <value>0.35</value>
</param>
<param>
<key>_coordinate</key>
- <value>(1074, 9)</value>
+ <value>(346, 72)</value>
</param>
<param>
<key>_rotation</key>
@@ -110,7 +110,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>payload_size</value>
+ <value>matched_filter</value>
</param>
<param>
<key>_enabled</key>
@@ -118,11 +118,11 @@
</param>
<param>
<key>value</key>
- <value>992</value>
+ <value>firdes.root_raised_cosine(nfilts, nfilts, 1, eb, int(11*sps*nfilts))</value>
</param>
<param>
<key>_coordinate</key>
- <value>(101, 73)</value>
+ <value>(429, 72)</value>
</param>
<param>
<key>_rotation</key>
@@ -133,7 +133,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>gap</value>
+ <value>preamble</value>
</param>
<param>
<key>_enabled</key>
@@ -141,11 +141,11 @@
</param>
<param>
<key>value</key>
- <value>20000</value>
+ <value>[1,-1,1,-1,1,1,-1,-1,1,1,-1,1,1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,1,-1,1,1,1,1,-1,-1,1,-1,1,-1,-1,-1,1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1]</value>
</param>
<param>
<key>_coordinate</key>
- <value>(202, 72)</value>
+ <value>(279, 8)</value>
</param>
<param>
<key>_rotation</key>
@@ -156,7 +156,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>bb_filter</value>
+ <value>sps</value>
</param>
<param>
<key>_enabled</key>
@@ -164,11 +164,11 @@
</param>
<param>
<key>value</key>
- <value>firdes.root_raised_cosine(sps, sps, 1, eb, 101)</value>
+ <value>4</value>
</param>
<param>
<key>_coordinate</key>
- <value>(429, 8)</value>
+ <value>(278, 72)</value>
</param>
<param>
<key>_rotation</key>
@@ -179,7 +179,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>sps</value>
+ <value>bb_filter</value>
</param>
<param>
<key>_enabled</key>
@@ -187,11 +187,11 @@
</param>
<param>
<key>value</key>
- <value>4</value>
+ <value>firdes.root_raised_cosine(sps, sps, 1, eb, 101)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(278, 72)</value>
+ <value>(429, 8)</value>
</param>
<param>
<key>_rotation</key>
@@ -202,7 +202,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>preamble</value>
+ <value>gap</value>
</param>
<param>
<key>_enabled</key>
@@ -210,11 +210,11 @@
</param>
<param>
<key>value</key>
- <value>[1,-1,1,-1,1,1,-1,-1,1,1,-1,1,1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,1,-1,1,1,1,1,-1,-1,1,-1,1,-1,-1,-1,1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1]</value>
+ <value>20000</value>
</param>
<param>
<key>_coordinate</key>
- <value>(279, 8)</value>
+ <value>(202, 72)</value>
</param>
<param>
<key>_rotation</key>
@@ -225,7 +225,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>matched_filter</value>
+ <value>payload_size</value>
</param>
<param>
<key>_enabled</key>
@@ -233,11 +233,11 @@
</param>
<param>
<key>value</key>
- <value>firdes.root_raised_cosine(nfilts, nfilts, 1, eb, int(11*sps*nfilts))</value>
+ <value>992</value>
</param>
<param>
<key>_coordinate</key>
- <value>(429, 72)</value>
+ <value>(101, 73)</value>
</param>
<param>
<key>_rotation</key>
@@ -248,7 +248,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>eb</value>
+ <value>nfilts</value>
</param>
<param>
<key>_enabled</key>
@@ -256,11 +256,11 @@
</param>
<param>
<key>value</key>
- <value>0.35</value>
+ <value>32</value>
</param>
<param>
<key>_coordinate</key>
- <value>(346, 72)</value>
+ <value>(1074, 9)</value>
</param>
<param>
<key>_rotation</key>
@@ -271,7 +271,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>samp_rate</value>
+ <value>rrc_taps</value>
</param>
<param>
<key>_enabled</key>
@@ -279,11 +279,11 @@
</param>
<param>
<key>value</key>
- <value>100000</value>
+ <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), eb, 5*sps*nfilts)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(11, 72)</value>
+ <value>(1075, 73)</value>
</param>
<param>
<key>_rotation</key>
@@ -317,6 +317,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(1091, 303)</value>
</param>
@@ -348,6 +352,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(1235, 194)</value>
</param>
@@ -379,6 +387,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(1235, 149)</value>
</param>
@@ -418,6 +430,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(972, 174)</value>
</param>
@@ -457,6 +473,10 @@
<value>0</value>
</param>
<param>
+ <key>block_tags</key>
+ <value>False</value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -465,6 +485,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(772, 158)</value>
</param>
@@ -496,6 +520,10 @@
<value>1</value>
</param>
<param>
+ <key>ignoretag</key>
+ <value>True</value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -504,6 +532,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(586, 190)</value>
</param>
@@ -551,6 +583,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(15, 165)</value>
</param>
@@ -602,6 +638,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(312, 166)</value>
</param>
@@ -645,6 +685,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(568, 288)</value>
</param>
@@ -672,103 +716,28 @@
<value>1</value>
</param>
<param>
- <key>affinity</key>
- <value></value>
- </param>
- <param>
- <key>minoutbuf</key>
- <value>0</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(402, 322)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>qtgui_time_sink_x</key>
- <param>
- <key>id</key>
- <value>qtgui_time_sink_x_1</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>float</value>
- </param>
- <param>
- <key>name</key>
- <value>QT GUI Plot</value>
- </param>
- <param>
- <key>size</key>
- <value>80000</value>
- </param>
- <param>
- <key>srate</key>
- <value>samp_rate</value>
- </param>
- <param>
- <key>ymin</key>
- <value>-200</value>
- </param>
- <param>
- <key>ymax</key>
- <value>400</value>
- </param>
- <param>
- <key>nconnections</key>
- <value>3</value>
- </param>
- <param>
- <key>update_time</key>
- <value>0.10</value>
- </param>
- <param>
- <key>tr_mode</key>
- <value>qtgui.TRIG_MODE_NORM</value>
+ <key>num_outputs</key>
+ <value>1</value>
</param>
<param>
- <key>tr_slope</key>
- <value>qtgui.TRIG_SLOPE_POS</value>
+ <key>bus_conns</key>
+ <value>[[0,],]</value>
</param>
<param>
- <key>tr_level</key>
- <value>200</value>
+ <key>affinity</key>
+ <value></value>
</param>
<param>
- <key>tr_delay</key>
+ <key>minoutbuf</key>
<value>0</value>
</param>
<param>
- <key>tr_chan</key>
+ <key>maxoutbuf</key>
<value>0</value>
</param>
<param>
- <key>tr_tag</key>
- <value>""</value>
- </param>
- <param>
- <key>entags</key>
- <value>True</value>
- </param>
- <param>
- <key>gui_hint</key>
- <value>1,0,1,2</value>
- </param>
- <param>
- <key>affinity</key>
- <value></value>
- </param>
- <param>
<key>_coordinate</key>
- <value>(1433, 160)</value>
+ <value>(402, 322)</value>
</param>
<param>
<key>_rotation</key>
@@ -799,156 +768,6 @@
</param>
</block>
<block>
- <key>qtgui_const_sink_x</key>
- <param>
- <key>id</key>
- <value>qtgui_const_sink_x_0_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>complex</value>
- </param>
- <param>
- <key>name</key>
- <value>QT GUI Plot</value>
- </param>
- <param>
- <key>size</key>
- <value>20000</value>
- </param>
- <param>
- <key>ymin</key>
- <value>-2</value>
- </param>
- <param>
- <key>ymax</key>
- <value>2</value>
- </param>
- <param>
- <key>xmin</key>
- <value>-2</value>
- </param>
- <param>
- <key>xmax</key>
- <value>2</value>
- </param>
- <param>
- <key>nconnections</key>
- <value>1</value>
- </param>
- <param>
- <key>update_time</key>
- <value>0.10</value>
- </param>
- <param>
- <key>gui_hint</key>
- <value>0,1,1,1</value>
- </param>
- <param>
- <key>affinity</key>
- <value></value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(1399, 291)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>qtgui_time_sink_x</key>
- <param>
- <key>id</key>
- <value>qtgui_time_sink_x_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>complex</value>
- </param>
- <param>
- <key>name</key>
- <value>QT GUI Plot</value>
- </param>
- <param>
- <key>size</key>
- <value>50000</value>
- </param>
- <param>
- <key>srate</key>
- <value>samp_rate</value>
- </param>
- <param>
- <key>ymin</key>
- <value>-2</value>
- </param>
- <param>
- <key>ymax</key>
- <value>2</value>
- </param>
- <param>
- <key>nconnections</key>
- <value>1</value>
- </param>
- <param>
- <key>update_time</key>
- <value>0.10</value>
- </param>
- <param>
- <key>tr_mode</key>
- <value>qtgui.TRIG_MODE_TAG</value>
- </param>
- <param>
- <key>tr_slope</key>
- <value>qtgui.TRIG_SLOPE_POS</value>
- </param>
- <param>
- <key>tr_level</key>
- <value>1</value>
- </param>
- <param>
- <key>tr_delay</key>
- <value>0.1</value>
- </param>
- <param>
- <key>tr_chan</key>
- <value>0</value>
- </param>
- <param>
- <key>tr_tag</key>
- <value>time_est</value>
- </param>
- <param>
- <key>entags</key>
- <value>True</value>
- </param>
- <param>
- <key>gui_hint</key>
- <value>0,0,1,1</value>
- </param>
- <param>
- <key>affinity</key>
- <value>0</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(1397, 358)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>variable_qtgui_range</key>
<param>
<key>id</key>
@@ -1219,6 +1038,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(790, 289)</value>
</param>
@@ -1266,6 +1089,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(30, 324)</value>
</param>
@@ -1297,6 +1124,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(55, 274)</value>
</param>
@@ -1340,6 +1171,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(247, 318)</value>
</param>
@@ -1426,6 +1261,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(1125, 617)</value>
</param>
@@ -1516,6 +1355,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(752, 517)</value>
</param>
@@ -1547,6 +1390,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(576, 517)</value>
</param>
@@ -1590,6 +1437,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(390, 504)</value>
</param>
@@ -1617,6 +1468,14 @@
<value>1</value>
</param>
<param>
+ <key>num_outputs</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>bus_conns</key>
+ <value>[[0,],]</value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1625,6 +1484,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(210, 538)</value>
</param>
@@ -1668,6 +1531,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(923, 518)</value>
</param>
@@ -1703,6 +1570,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(1112, 482)</value>
</param>
@@ -1738,6 +1609,10 @@
<value>samp_rate</value>
</param>
<param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
<key>ymin</key>
<value>-2</value>
</param>
@@ -1754,6 +1629,14 @@
<value>0.10</value>
</param>
<param>
+ <key>entags</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value>2,0,1,2</value>
+ </param>
+ <param>
<key>tr_mode</key>
<value>qtgui.TRIG_MODE_TAG</value>
</param>
@@ -1778,12 +1661,244 @@
<value>time_est</value>
</param>
<param>
- <key>entags</key>
- <value>True</value>
+ <key>label1</key>
+ <value></value>
</param>
<param>
- <key>gui_hint</key>
- <value>2,0,1,2</value>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker1</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker2</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>style3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker3</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>style4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker4</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>style5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker5</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>style6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker6</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>style7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker7</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>style8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker8</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>style9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker9</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color10</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker10</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha10</key>
+ <value>1.0</value>
</param>
<param>
<key>affinity</key>
@@ -1821,6 +1936,10 @@
<value>0</value>
</param>
<param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(1111, 433)</value>
</param>
@@ -1829,6 +1948,975 @@
<value>180</value>
</param>
</block>
+ <block>
+ <key>qtgui_time_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_time_sink_x_1</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>float</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>size</key>
+ <value>80000</value>
+ </param>
+ <param>
+ <key>srate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-200</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>400</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>entags</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value>1,0,1,2</value>
+ </param>
+ <param>
+ <key>tr_mode</key>
+ <value>qtgui.TRIG_MODE_NORM</value>
+ </param>
+ <param>
+ <key>tr_slope</key>
+ <value>qtgui.TRIG_SLOPE_POS</value>
+ </param>
+ <param>
+ <key>tr_level</key>
+ <value>200</value>
+ </param>
+ <param>
+ <key>tr_delay</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>tr_chan</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>tr_tag</key>
+ <value>""</value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value>|corr|^2</value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker1</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value>Re{corr}</value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker2</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value>Im{corr}</value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>style3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker3</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>style4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker4</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>style5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker5</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>style6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker6</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>style7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker7</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>style8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker8</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>style9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker9</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color10</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker10</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha10</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1433, 160)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>qtgui_time_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_time_sink_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>size</key>
+ <value>50000</value>
+ </param>
+ <param>
+ <key>srate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-2</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>entags</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value>0,0,1,1</value>
+ </param>
+ <param>
+ <key>tr_mode</key>
+ <value>qtgui.TRIG_MODE_TAG</value>
+ </param>
+ <param>
+ <key>tr_slope</key>
+ <value>qtgui.TRIG_SLOPE_POS</value>
+ </param>
+ <param>
+ <key>tr_level</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>tr_delay</key>
+ <value>0.1</value>
+ </param>
+ <param>
+ <key>tr_chan</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>tr_tag</key>
+ <value>time_est</value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker1</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker2</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>style3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker3</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>style4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker4</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>style5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker5</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>style6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker6</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>style7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker7</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>style8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker8</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>style9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker9</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color10</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>marker10</key>
+ <value>-1</value>
+ </param>
+ <param>
+ <key>alpha10</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1398, 370)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>qtgui_const_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_const_sink_x_0_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>size</key>
+ <value>20000</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-2</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>xmin</key>
+ <value>-2</value>
+ </param>
+ <param>
+ <key>xmax</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value>0,1,1,1</value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>style1</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker1</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style2</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker2</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style3</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker3</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style4</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker4</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style5</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker5</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style6</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker6</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style7</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker7</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style8</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker8</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style9</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker9</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color10</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>style10</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>marker10</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha10</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1399, 291)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>digital_costas_loop_cc_0</source_block_id>
<sink_block_id>qtgui_const_sink_x_0_0</sink_block_id>
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 007a7e6106..9eca98ddb1 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -1,19 +1,19 @@
<?xml version="1.0"?>
<!--
Copyright 2011-2013 Free Software Foundation, Inc.
-
+
This file is part of GNU Radio
-
+
GNU Radio is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
-
+
GNU Radio is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with GNU Radio; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street,
@@ -66,7 +66,7 @@
</cat>
<cat>
<name>Packet Operators</name>
- <block>digital_correlate_access_code_bb</block>
+ <block>digital_correlate_access_code_tag_bb</block>
<block>digital_crc32_bb</block>
<block>digital_framer_sink_1</block>
<block>digital_header_payload_demux</block>
@@ -75,6 +75,8 @@
<block>digital_packet_headerparser_b</block>
<block>digital_packet_headerparser_b_default</block>
<block>digital_packet_sink</block>
+ <block>digital_hdlc_framer_pb</block>
+ <block>digital_hdlc_deframer_bp</block>
<block>digital_simple_framer</block>
<block>digital_simple_correlator</block>
</cat>
@@ -126,7 +128,6 @@
<cat>
<name>Deprecated</name>
<block>digital_correlate_access_code_bb</block>
- <block>digital_correlate_access_code_tag_bb</block>
<block>digital_simple_framer</block>
<block>digital_simple_correlator</block>
</cat>
diff --git a/gr-digital/grc/digital_constellation_modulator.xml b/gr-digital/grc/digital_constellation_modulator.xml
index 7b7ce24e47..9905197f93 100644
--- a/gr-digital/grc/digital_constellation_modulator.xml
+++ b/gr-digital/grc/digital_constellation_modulator.xml
@@ -86,7 +86,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_dxpsk_demod.xml b/gr-digital/grc/digital_dxpsk_demod.xml
index 1c6314d305..5b26d5b8ec 100644
--- a/gr-digital/grc/digital_dxpsk_demod.xml
+++ b/gr-digital/grc/digital_dxpsk_demod.xml
@@ -114,7 +114,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_dxpsk_mod.xml b/gr-digital/grc/digital_dxpsk_mod.xml
index 08a95f1a9c..02da10028e 100644
--- a/gr-digital/grc/digital_dxpsk_mod.xml
+++ b/gr-digital/grc/digital_dxpsk_mod.xml
@@ -91,7 +91,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_gfsk_demod.xml b/gr-digital/grc/digital_gfsk_demod.xml
index ce3024d892..cbea39e63e 100644
--- a/gr-digital/grc/digital_gfsk_demod.xml
+++ b/gr-digital/grc/digital_gfsk_demod.xml
@@ -70,7 +70,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_gfsk_mod.xml b/gr-digital/grc/digital_gfsk_mod.xml
index 2d6cd1ea54..08e2c84790 100644
--- a/gr-digital/grc/digital_gfsk_mod.xml
+++ b/gr-digital/grc/digital_gfsk_mod.xml
@@ -49,7 +49,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_gmsk_demod.xml b/gr-digital/grc/digital_gmsk_demod.xml
index e037b8ea03..4d57f1a17a 100644
--- a/gr-digital/grc/digital_gmsk_demod.xml
+++ b/gr-digital/grc/digital_gmsk_demod.xml
@@ -63,7 +63,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_gmsk_mod.xml b/gr-digital/grc/digital_gmsk_mod.xml
index ede76808ad..77f52ca2f2 100644
--- a/gr-digital/grc/digital_gmsk_mod.xml
+++ b/gr-digital/grc/digital_gmsk_mod.xml
@@ -42,7 +42,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_hdlc_deframer_bp.xml b/gr-digital/grc/digital_hdlc_deframer_bp.xml
new file mode 100644
index 0000000000..41bd37c7ee
--- /dev/null
+++ b/gr-digital/grc/digital_hdlc_deframer_bp.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<block>
+ <name>HDLC Deframer</name>
+ <key>digital_hdlc_deframer_bp</key>
+ <import>from gnuradio import digital</import>
+ <make>digital.hdlc_deframer_bp($frame_tag_name, $min, $max)</make>
+ <param>
+ <name>Frame tag name</name>
+ <key>frame_tag_name</key>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Min length</name>
+ <key>min</key>
+ <value>32</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Max length</name>
+ <key>max</key>
+ <value>500</value>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>message</type>
+ </source>
+</block>
diff --git a/gr-digital/grc/digital_hdlc_framer_pb.xml b/gr-digital/grc/digital_hdlc_framer_pb.xml
new file mode 100644
index 0000000000..8dc122d581
--- /dev/null
+++ b/gr-digital/grc/digital_hdlc_framer_pb.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<block>
+ <name>HDLC Framer</name>
+ <key>digital_hdlc_framer_pb</key>
+ <import>from gnuradio import digital</import>
+ <make>digital.hdlc_framer_pb($frame_tag_name)</make>
+ <param>
+ <name>Frame tag name</name>
+ <key>frame_tag_name</key>
+ <type>string</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>message</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
diff --git a/gr-digital/grc/digital_header_payload_demux.xml b/gr-digital/grc/digital_header_payload_demux.xml
index 5d19e89e87..1037efde61 100644
--- a/gr-digital/grc/digital_header_payload_demux.xml
+++ b/gr-digital/grc/digital_header_payload_demux.xml
@@ -81,6 +81,11 @@
<key>short</key>
<opt>itemsize:gr.sizeof_short</opt>
</option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>itemsize:gr.sizeof_char</opt>
+ </option>
</param>
<param>
<name>Timing tag key</name>
diff --git a/gr-digital/grc/digital_psk_demod.xml b/gr-digital/grc/digital_psk_demod.xml
index 2e0e86ebc6..36e803ae73 100644
--- a/gr-digital/grc/digital_psk_demod.xml
+++ b/gr-digital/grc/digital_psk_demod.xml
@@ -120,7 +120,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_psk_mod.xml b/gr-digital/grc/digital_psk_mod.xml
index cafcf4e505..e7788842a8 100644
--- a/gr-digital/grc/digital_psk_mod.xml
+++ b/gr-digital/grc/digital_psk_mod.xml
@@ -100,7 +100,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_qam_demod.xml b/gr-digital/grc/digital_qam_demod.xml
index 5aaec1bd0a..21ccba856b 100644
--- a/gr-digital/grc/digital_qam_demod.xml
+++ b/gr-digital/grc/digital_qam_demod.xml
@@ -121,7 +121,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/grc/digital_qam_mod.xml b/gr-digital/grc/digital_qam_mod.xml
index 4d73d9a685..435ca7058e 100644
--- a/gr-digital/grc/digital_qam_mod.xml
+++ b/gr-digital/grc/digital_qam_mod.xml
@@ -100,7 +100,7 @@
</option>
</param>
<param>
- <name>Logging</name>
+ <name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
diff --git a/gr-digital/include/gnuradio/digital/CMakeLists.txt b/gr-digital/include/gnuradio/digital/CMakeLists.txt
index 4d50f42ae0..63b65b9c77 100644
--- a/gr-digital/include/gnuradio/digital/CMakeLists.txt
+++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt
@@ -101,6 +101,8 @@ install(FILES
glfsr.h
glfsr_source_b.h
glfsr_source_f.h
+ hdlc_deframer_bp.h
+ hdlc_framer_pb.h
header_payload_demux.h
kurtotic_equalizer_cc.h
lfsr.h
diff --git a/gr-digital/include/gnuradio/digital/costas_loop_cc.h b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
index 5320d704c3..d924d969b7 100644
--- a/gr-digital/include/gnuradio/digital/costas_loop_cc.h
+++ b/gr-digital/include/gnuradio/digital/costas_loop_cc.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2011,2012 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -30,7 +30,7 @@
namespace gr {
namespace digital {
- /*!
+ /*!
* \brief A Costas loop carrier recovery module.
* \ingroup synchronizers_blk
*
@@ -54,20 +54,20 @@ namespace gr {
* signal processing, pp. 20-36, 2002.
*
* http://rfdesign.com/images/archive/0102Feigin20.pdf
- *
+ *
* The Costas loop can have two output streams:
* \li stream 1 (required) is the baseband I and Q;
* \li stream 2 (optional) is the normalized frequency of the loop
*/
class DIGITAL_API costas_loop_cc
- : virtual public sync_block,
+ : virtual public sync_block,
virtual public blocks::control_loop
{
public:
// gr::digital::costas_loop_cc::sptr
typedef boost::shared_ptr<costas_loop_cc> sptr;
- /*!
+ /*!
* Make a Costas loop carrier recovery block.
*
* \param loop_bw internal 2nd order loop bandwidth (~ 2pi/100)
@@ -75,7 +75,7 @@ namespace gr {
*/
static sptr make(float loop_bw, int order);
- /*!
+ /*!
* Returns the current value of the loop error.
*/
virtual float error() const = 0;
diff --git a/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h b/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h
new file mode 100644
index 0000000000..191f294344
--- /dev/null
+++ b/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_DIGITAL_HDLC_DEFRAMER_BP_H
+#define INCLUDED_DIGITAL_HDLC_DEFRAMER_BP_H
+
+#include <gnuradio/digital/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace digital {
+
+ /*!
+ * \brief HDLC deframer which takes in unpacked bits, and outputs PDU
+ * binary blobs. This is intended for use with the
+ * correlate_access_code_tag_bb block, which should have an access code
+ * of "01111110" for use with HDLC frames. Frames which do not pass CRC are
+ * rejected.
+ *
+ * \ingroup digital
+ *
+ */
+ class DIGITAL_API hdlc_deframer_bp : virtual public gr::sync_block
+ {
+ public:
+ typedef boost::shared_ptr<hdlc_deframer_bp> sptr;
+
+ /*!
+ * \brief Return a shared_ptr to a new instance of digital::hdlc_deframer.
+ *
+ * \param frame_tag_name: The tag name from an upstream
+ * correlate_access_code_tag_bb block.
+ * \param length_min: Minimum frame size (default: 32)
+ * \param length_max: Maximum frame size (default: 500)
+ */
+ static sptr make(const std::string frame_tag_name, int length_min, int length_max);
+ };
+
+ } // namespace digital
+} // namespace gr
+
+#endif /* INCLUDED_DIGITAL_HDLC_DEFRAMER_BP_H */
+
diff --git a/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h b/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h
new file mode 100644
index 0000000000..d2931a9fff
--- /dev/null
+++ b/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_DIGITAL_HDLC_FRAMER_PB_H
+#define INCLUDED_DIGITAL_HDLC_FRAMER_PB_H
+
+#include <gnuradio/digital/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+ namespace digital {
+
+ /*!
+ * \brief HDLC framer which takes in PMT binary blobs and outputs HDLC
+ * frames as unpacked bits, with CRC and bit stuffing added. The first sample
+ * of the frame is tagged with the tag frame_tag_name and includes a
+ * length field for tagged_stream use.
+ *
+ * This block outputs one whole frame at a time; if there is not enough
+ * output buffer space to fit a frame, it is pushed onto a queue. As a result
+ * flowgraphs which only run for a finite number of samples may not receive
+ * all frames in the queue, due to the scheduler's granularity. For
+ * flowgraphs that stream continuously (anything using a USRP) this should
+ * not be an issue.
+ *
+ * \ingroup digital
+ *
+ */
+ class DIGITAL_API hdlc_framer_pb : virtual public gr::sync_block
+ {
+ public:
+ typedef boost::shared_ptr<hdlc_framer_pb> sptr;
+
+ /*!
+ * \brief Return a shared_ptr to a new instance of digital::hdlc_framer.
+ *
+ * \param frame_tag_name: The tag to add to the first sample of each frame.
+ */
+ static sptr make(const std::string frame_tag_name);
+ };
+
+ } // namespace digital
+} // namespace gr
+
+#endif /* INCLUDED_DIGITAL_HDLC_FRAMER_PB_H */
+
diff --git a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
index df67609d9c..618d192771 100644
--- a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
+++ b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h
@@ -77,27 +77,27 @@ namespace gr {
/*!
* \brief Make a M-PSK receiver block.
*
- * \param M modulation order of the M-PSK modulation
- * \param theta any constant phase rotation from the real axis of the constellation
- * \param loop_bw Loop bandwidth to set gains of phase/freq tracking loop
- * \param fmin minimum normalized frequency value the loop can achieve
- * \param fmax maximum normalized frequency value the loop can achieve
- * \param mu initial parameter for the interpolator [0,1]
- * \param gain_mu gain parameter of the M&M error signal to adjust mu (~0.05)
- * \param omega initial value for the number of symbols between samples (~number of samples/symbol)
- * \param gain_omega gain parameter to adjust omega based on the error (~omega^2/4)
- * \param omega_rel sets the maximum (omega*(1+omega_rel)) and minimum (omega*(1+omega_rel)) omega (~0.005)
+ * \param M modulation order of the M-PSK modulation
+ * \param theta any constant phase rotation from the real axis of the constellation
+ * \param loop_bw Loop bandwidth to set gains of phase/freq tracking loop
+ * \param fmin minimum normalized frequency value the loop can achieve
+ * \param fmax maximum normalized frequency value the loop can achieve
+ * \param mu initial parameter for the interpolator [0,1]
+ * \param gain_mu gain parameter of the M&M error signal to adjust mu (~0.05)
+ * \param omega initial value for the number of symbols between samples (~number of samples/symbol)
+ * \param gain_omega gain parameter to adjust omega based on the error (~omega^2/4)
+ * \param omega_rel sets the maximum (omega*(1+omega_rel)) and minimum (omega*(1+omega_rel)) omega (~0.005)
*
* The constructor also chooses which phase detector and
* decision maker to use in the work loop based on the value of
* M.
*/
- static sptr make(unsigned int M, float theta,
+ static sptr make(unsigned int M, float theta,
float loop_bw,
float fmin, float fmax,
- float mu, float gain_mu,
+ float mu, float gain_mu,
float omega, float gain_omega, float omega_rel);
-
+
//! Returns the modulation order (M) currently set
virtual float modulation_order() const = 0;
@@ -127,8 +127,8 @@ namespace gr {
//! Sets value of mu
virtual void set_mu(float mu) = 0;
-
- //! Sets value of omega and its min and max values
+
+ //! Sets value of omega and its min and max values
virtual void set_omega(float omega) = 0;
//! Sets value for mu gain factor
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 509a9a5bbf..00200d1dc3 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -137,6 +137,8 @@ list(APPEND digital_sources
glfsr.cc
glfsr_source_b_impl.cc
glfsr_source_f_impl.cc
+ hdlc_deframer_bp_impl.cc
+ hdlc_framer_pb_impl.cc
header_payload_demux_impl.cc
kurtotic_equalizer_cc_impl.cc
lms_dd_equalizer_cc_impl.cc
diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
index 0d64caa7ab..f6574dd517 100644
--- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
@@ -27,7 +27,8 @@
#include "correlate_access_code_tag_bb_impl.h"
#include <gnuradio/io_signature.h>
#include <stdexcept>
-#include <gnuradio/blocks/count_bits.h>
+//#include <gnuradio/blocks/count_bits.h>
+#include <volk/volk.h>
#include <cstdio>
#include <iostream>
@@ -75,16 +76,18 @@ namespace gr {
{
d_len = access_code.length(); // # of bytes in string
if(d_len > 64)
- return false;
+ return false;
- // set len top bits to 1.
- d_mask = ((~0ULL) >> (64 - d_len)) << (64 - d_len);
+ // set d_len bottom bits to 1.
+ d_mask = (1ULL << d_len) - 1;
d_access_code = 0;
- for(unsigned i=0; i < 64; i++){
- d_access_code <<= 1;
- if(i < d_len)
- d_access_code |= access_code[i] & 1; // look at LSB only
+ for(unsigned i=0; i < d_len; i++){
+ d_access_code = (d_access_code << 1) | (access_code[i] & 1);
+ }
+ if(VERBOSE) {
+ std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl;
+ std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl;
}
return true;
@@ -104,25 +107,21 @@ namespace gr {
out[i] = in[i];
// compute hamming distance between desired access code and current data
- unsigned long long wrong_bits = 0;
- unsigned int nwrong = d_threshold+1;
- int new_flag = 0;
+ uint64_t wrong_bits = 0;
+ uint64_t nwrong = d_threshold+1;
wrong_bits = (d_data_reg ^ d_access_code) & d_mask;
- nwrong = gr::blocks::count_bits64(wrong_bits);
-
- // test for access code with up to threshold errors
- new_flag = (nwrong <= d_threshold);
+ volk_64u_popcnt(&nwrong, wrong_bits);
// shift in new data and new flag
d_data_reg = (d_data_reg << 1) | (in[i] & 0x1);
- if(new_flag) {
+ if(nwrong <= d_threshold) {
if(VERBOSE)
std::cerr << "writing tag at sample " << abs_out_sample_cnt + i << std::endl;
add_item_tag(0, //stream ID
- abs_out_sample_cnt + i - 64 + d_len, //sample
+ abs_out_sample_cnt + i, //sample
d_key, //frame info
- pmt::pmt_t(), //data (unused)
+ pmt::from_long(nwrong), //data (number wrong)
d_me //block src id
);
}
diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc
index 36a125b437..36f95ac022 100644
--- a/gr-digital/lib/costas_loop_cc_impl.cc
+++ b/gr-digital/lib/costas_loop_cc_impl.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2010-2012 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -62,7 +62,7 @@ namespace gr {
d_phase_detector = &costas_loop_cc_impl::phase_detector_8;
break;
- default:
+ default:
throw std::invalid_argument("order must be 2, 4, or 8");
break;
}
@@ -145,19 +145,19 @@ namespace gr {
tags.erase(tags.begin());
}
}
-
+
nco_out = gr_expj(-d_phase);
optr[i] = iptr[i] * nco_out;
d_error = (*this.*d_phase_detector)(optr[i]);
d_error = gr::branchless_clip(d_error, 1.0);
-
+
advance_loop(d_error);
phase_wrap();
frequency_limit();
foptr[i] = d_freq;
- }
+ }
}
else {
for(int i = 0; i < noutput_items; i++) {
@@ -219,7 +219,7 @@ namespace gr {
pmt::mp(0.0f), pmt::mp(2.0f), pmt::mp(0.0f),
"", "Loop bandwidth", RPC_PRIVLVL_MIN,
DISPTIME | DISPOPTSTRIP)));
-
+
// Setters
add_rpc_variable(
rpcbasic_sptr(new rpcbasic_register_set<control_loop, float>(
diff --git a/gr-digital/lib/costas_loop_cc_impl.h b/gr-digital/lib/costas_loop_cc_impl.h
index 0559f907aa..665724236b 100644
--- a/gr-digital/lib/costas_loop_cc_impl.h
+++ b/gr-digital/lib/costas_loop_cc_impl.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2011,2012 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -62,7 +62,7 @@ namespace gr {
float error() const;
void setup_rpc();
-
+
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.cc b/gr-digital/lib/hdlc_deframer_bp_impl.cc
new file mode 100644
index 0000000000..69f0f8c00d
--- /dev/null
+++ b/gr-digital/lib/hdlc_deframer_bp_impl.cc
@@ -0,0 +1,160 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/io_signature.h>
+#include <gnuradio/tags.h>
+#include "hdlc_deframer_bp_impl.h"
+
+namespace gr {
+ namespace digital {
+
+ hdlc_deframer_bp::sptr
+ hdlc_deframer_bp::make(const std::string frame_tag_name,
+ int length_min=32,
+ int length_max=500)
+ {
+ return gnuradio::get_initial_sptr
+ (new hdlc_deframer_bp_impl(frame_tag_name, length_min, length_max));
+ }
+
+ /*
+ * The private constructor
+ */
+ hdlc_deframer_bp_impl::hdlc_deframer_bp_impl(const std::string frame_tag_name,
+ int length_min,
+ int length_max)
+ : gr::sync_block("hdlc_deframer_bp",
+ gr::io_signature::make(1, 1, sizeof(unsigned char)),
+ gr::io_signature::make(0, 0, 0)),
+ d_frame_tag_name(frame_tag_name),
+ d_length_min(length_min),
+ d_length_max(length_max)
+ {
+ set_output_multiple(length_max*2);
+ message_port_register_out(pmt::mp("out"));
+ }
+
+ /*
+ * Our virtual destructor.
+ */
+ hdlc_deframer_bp_impl::~hdlc_deframer_bp_impl()
+ {
+ }
+
+ //undo HDLC bit stuffing operation.
+ static void unstuff(std::vector<unsigned char> &pkt) {
+ int consec = 0;
+ for(size_t i=0; i<pkt.size(); i++) {
+ if(pkt[i]) {
+ consec++;
+ } else {
+ if(consec == 5) {
+ pkt.erase(pkt.begin()+i);
+ i--;
+ }
+ consec = 0;
+ }
+ }
+ }
+
+ //pack unpacked (1 bit per byte) data into bytes, in reverse bit order
+ //we reverse the bit order because HDLC uses LSbit format.
+ std::vector<unsigned char>
+ hdlc_deframer_bp_impl::pack(std::vector<unsigned char> &data)
+ {
+ std::vector<unsigned char> output(std::ceil(data.size()/8.0f), 0);
+ for(size_t i=0; i<data.size(); i++) {
+ output[i/8] |= (data[i]<<(i%8));
+ }
+ return output;
+ }
+
+ unsigned int
+ hdlc_deframer_bp_impl::crc_ccitt(std::vector<unsigned char> &data) {
+ unsigned int POLY=0x8408; //reflected 0x1021
+ unsigned short crc=0xFFFF;
+ for(size_t i=0; i<data.size(); i++) {
+ crc ^= data[i];
+ for(size_t j=0; j<8; j++) {
+ if(crc&0x01) crc = (crc >> 1) ^ POLY;
+ else crc = (crc >> 1);
+ }
+ }
+ return crc ^ 0xFFFF;
+ }
+
+ int
+ hdlc_deframer_bp_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ const unsigned char *in = (const unsigned char *) input_items[0];
+
+ //look for frame delimiter tags
+ std::vector<gr::tag_t> frame_tags;
+ uint64_t abs_sample_cnt = nitems_read(0);
+ get_tags_in_range(frame_tags, 0, abs_sample_cnt, abs_sample_cnt + noutput_items, pmt::string_to_symbol(d_frame_tag_name));
+
+ int end_pos = 0;
+ while(frame_tags.size() > 0) {
+ int start_pos = frame_tags[0].offset - abs_sample_cnt;
+ if(frame_tags.size() == 1) return start_pos; //start here next time
+ end_pos = frame_tags[1].offset - abs_sample_cnt;
+ int pkt_len = frame_tags[1].offset - frame_tags[0].offset - 8; //omit EOF delim
+ if(pkt_len > d_length_max) return end_pos; //arbitrary, too long for a real pkt
+ if(pkt_len <= d_length_min) return end_pos;
+
+ //get bit array
+ std::vector<unsigned char> pkt_bits(pkt_len);
+ memcpy(&pkt_bits[0], &in[start_pos], pkt_bits.size());
+
+ unstuff(pkt_bits);
+
+ //pack into bytes (and correct bit order)
+ std::vector<unsigned char> pkt_bytes = pack(pkt_bits);
+
+ //strip off the CRC
+ unsigned int crc = (int(pkt_bytes[pkt_bytes.size()-1]) << 8)
+ + pkt_bytes[pkt_bytes.size()-2];
+ pkt_bytes.erase(pkt_bytes.end()-2, pkt_bytes.end());
+ unsigned int calc_crc = crc_ccitt(pkt_bytes);
+
+ if(crc == calc_crc) {
+ //publish
+ //TODO manage padding
+ pmt::pmt_t pdu(pmt::cons(pmt::PMT_NIL,
+ pmt::make_blob(&pkt_bytes[0], pkt_bytes.size())));
+ message_port_pub(pmt::mp("out"), pdu);
+ }
+ frame_tags.erase(frame_tags.begin());
+ }
+ // Tell runtime system how many output items we produced.
+ return end_pos;
+ }
+
+ } /* namespace digital */
+} /* namespace gr */
+
diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.h b/gr-digital/lib/hdlc_deframer_bp_impl.h
new file mode 100644
index 0000000000..de8f6b3db7
--- /dev/null
+++ b/gr-digital/lib/hdlc_deframer_bp_impl.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_DIGITAL_HDLC_DEFRAMER_BP_IMPL_H
+#define INCLUDED_DIGITAL_HDLC_DEFRAMER_BP_IMPL_H
+
+#include <gnuradio/digital/hdlc_deframer_bp.h>
+
+namespace gr {
+ namespace digital {
+
+ class hdlc_deframer_bp_impl : public hdlc_deframer_bp
+ {
+ private:
+ std::string d_frame_tag_name;
+ int d_length_min;
+ int d_length_max;
+ unsigned int crc_ccitt(std::vector<unsigned char> &data);
+ std::vector<unsigned char> pack(std::vector<unsigned char> &pkt);
+
+ public:
+ hdlc_deframer_bp_impl(const std::string frame_tag_name, int length_min, int length_max);
+ ~hdlc_deframer_bp_impl();
+
+ // Where all the action really happens
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } // namespace digital
+} // namespace gr
+
+#endif /* INCLUDED_DIGITAL_HDLC_DEFRAMER_BP_IMPL_H */
+
diff --git a/gr-digital/lib/hdlc_framer_pb_impl.cc b/gr-digital/lib/hdlc_framer_pb_impl.cc
new file mode 100644
index 0000000000..27dec5267e
--- /dev/null
+++ b/gr-digital/lib/hdlc_framer_pb_impl.cc
@@ -0,0 +1,184 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/io_signature.h>
+#include <gnuradio/tags.h>
+#include "hdlc_framer_pb_impl.h"
+#include <iostream>
+
+namespace gr {
+ namespace digital {
+
+ hdlc_framer_pb::sptr
+ hdlc_framer_pb::make(const std::string frame_tag_name)
+ {
+ return gnuradio::get_initial_sptr
+ (new hdlc_framer_pb_impl(frame_tag_name));
+ }
+
+ /*
+ * The private constructor
+ */
+ hdlc_framer_pb_impl::hdlc_framer_pb_impl(const std::string frame_tag_name)
+ : gr::sync_block("hdlc_framer_pb",
+ gr::io_signature::make(0, 0, 0),
+ gr::io_signature::make(1, 1, sizeof(unsigned char)))
+ {
+ message_port_register_in(pmt::mp("in"));
+ d_frame_tag = pmt::string_to_symbol(frame_tag_name);
+ std::stringstream str;
+ str << name() << unique_id();
+ d_me = pmt::string_to_symbol(str.str());
+ }
+
+ /*
+ * Our virtual destructor.
+ */
+ hdlc_framer_pb_impl::~hdlc_framer_pb_impl()
+ {
+ }
+
+ //bit stuff
+ void
+ hdlc_framer_pb_impl::stuff(std::vector<unsigned char> &pkt) {
+ int consec = 0;
+ for(size_t i=0; i < pkt.size(); i++) {
+ if(consec == 5) {
+ pkt.insert(pkt.begin()+i, 0);
+ consec = 0;
+ }
+ if(pkt[i]==1) consec++;
+ else consec=0;
+ }
+ }
+
+ //unpack packed (8 bits per byte) into bits, in LSbit order.
+ //TODO: handle non-multiple-of-8 bit lengths (pad low)
+ std::vector<unsigned char>
+ hdlc_framer_pb_impl::unpack(std::vector<unsigned char> &data) {
+ std::vector<unsigned char> output(data.size()*8, 0);
+ for(size_t i=0; i<data.size(); i++) {
+ for(size_t j=0; j<8; j++) {
+ output[i*8+j] = (data[i] >> j) & 1;
+ }
+ }
+ return output;
+ }
+
+ unsigned int
+ hdlc_framer_pb_impl::crc_ccitt(std::vector<unsigned char> &data) {
+ unsigned int POLY=0x8408; //reflected 0x1021
+ unsigned short crc=0xFFFF;
+ for(size_t i=0; i<data.size(); i++) {
+ crc ^= data[i];
+ for(size_t j=0; j<8; j++) {
+ if(crc&0x01) crc = (crc >> 1) ^ POLY;
+ else crc = (crc >> 1);
+ }
+ }
+ return crc ^ 0xFFFF;
+ }
+
+ int
+ hdlc_framer_pb_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ unsigned char *out = (unsigned char *) output_items[0];
+
+ //send leftovers one chunk at a time.
+ //it'd be more efficient to send as much as possible, i.e.
+ //partial packets., but if we're to preserve tag boundaries
+ //this is much, much simpler.
+ int oidx = 0;
+ while(d_leftovers.size() > 0) {
+ if(noutput_items < (oidx+d_leftovers[0].size())) return oidx;
+ memcpy(out+oidx, &d_leftovers[0][0], d_leftovers[0].size());
+ //start tag
+ add_item_tag(0,
+ nitems_written(0)+oidx,
+ d_frame_tag,
+ pmt::from_long(d_leftovers[0].size()),
+ d_me);
+ oidx += d_leftovers[0].size();
+ d_leftovers.erase(d_leftovers.begin());
+ }
+
+ //get PDU
+ pmt::pmt_t msg(delete_head_nowait(pmt::mp("in")));
+ if(msg.get() == NULL) return oidx;
+
+ pmt::pmt_t len(pmt::car(msg)); //TODO for non-mult-8 nbits
+ pmt::pmt_t blob(pmt::cdr(msg));
+ if(!pmt::is_blob(blob))
+ throw std::runtime_error("HDLC framer: PMT must be blob");
+ std::vector<unsigned char> pkt(pmt::blob_length(blob));
+ memcpy(&pkt[0], (const unsigned char *) pmt::blob_data(blob), pkt.size());
+
+ //calc CRC
+ unsigned int crc = crc_ccitt(pkt);
+
+ //append CRC
+ pkt.insert(pkt.end(), crc & 0xFF);
+ pkt.insert(pkt.end(), (crc >> 8) & 0xFF);
+
+ //unpack to LSb bits
+ std::vector<unsigned char> pkt_bits = unpack(pkt);
+
+ //bitstuff
+ stuff(pkt_bits);
+
+ //add framing
+ const unsigned char framing[] = {0,1,1,1,1,1,1,0};
+ std::vector<unsigned char> framing_vec(framing, framing+sizeof(framing));
+ pkt_bits.insert(pkt_bits.begin(), framing_vec.begin(), framing_vec.end());
+ pkt_bits.insert(pkt_bits.end(), framing_vec.begin(), framing_vec.end());
+
+ //make sure we have the space. unfortunately, we didn't know
+ //until now, since the stuffing must be calculated. we'll just
+ //save it for next time.
+ if(noutput_items < (oidx+pkt_bits.size())) {
+ d_leftovers.insert(d_leftovers.end(), pkt_bits);
+ return oidx;
+ }
+
+ //produce
+ memcpy(out+oidx, &pkt_bits[0], pkt_bits.size());
+ //start tag
+ add_item_tag(0,
+ nitems_written(0)+oidx,
+ d_frame_tag,
+ pmt::from_long(pkt_bits.size()),
+ d_me);
+ oidx += pkt_bits.size();
+
+ //return # output bits
+ return oidx;
+ }
+
+ } /* namespace digital */
+} /* namespace gr */
+
diff --git a/gr-digital/lib/hdlc_framer_pb_impl.h b/gr-digital/lib/hdlc_framer_pb_impl.h
new file mode 100644
index 0000000000..90d51a96e6
--- /dev/null
+++ b/gr-digital/lib/hdlc_framer_pb_impl.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_DIGITAL_HDLC_FRAMER_PB_IMPL_H
+#define INCLUDED_DIGITAL_HDLC_FRAMER_PB_IMPL_H
+
+#include <gnuradio/digital/hdlc_framer_pb.h>
+#include <pmt/pmt.h>
+
+namespace gr {
+ namespace digital {
+
+ class hdlc_framer_pb_impl : public hdlc_framer_pb
+ {
+ private:
+ std::vector<std::vector<unsigned char> > d_leftovers;
+ pmt::pmt_t d_frame_tag, d_me;
+ unsigned int crc_ccitt(std::vector<unsigned char> &data);
+ std::vector<unsigned char> unpack(std::vector<unsigned char> &pkt);
+ void stuff(std::vector<unsigned char> &pkt);
+
+ public:
+ hdlc_framer_pb_impl(const std::string frame_tag_name);
+ ~hdlc_framer_pb_impl();
+
+ // Where all the action really happens
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } // namespace digital
+} // namespace gr
+
+#endif /* INCLUDED_DIGITAL_HDLC_FRAMER_PB_IMPL_H */
+
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.cc b/gr-digital/lib/mpsk_receiver_cc_impl.cc
index 0d7464a0fb..d6c2ae6fa3 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.cc
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.cc
@@ -37,35 +37,35 @@ namespace gr {
#define VERBOSE_MM 0 // Used for debugging symbol timing loop
#define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking
- mpsk_receiver_cc::sptr
+ mpsk_receiver_cc::sptr
mpsk_receiver_cc::make(unsigned int M, float theta,
float loop_bw,
float fmin, float fmax,
- float mu, float gain_mu,
+ float mu, float gain_mu,
float omega, float gain_omega, float omega_rel)
{
return gnuradio::get_initial_sptr
(new mpsk_receiver_cc_impl(M, theta,
loop_bw,
fmin, fmax,
- mu, gain_mu,
- omega, gain_omega,
+ mu, gain_mu,
+ omega, gain_omega,
omega_rel));
}
- mpsk_receiver_cc_impl::mpsk_receiver_cc_impl(unsigned int M, float theta,
+ mpsk_receiver_cc_impl::mpsk_receiver_cc_impl(unsigned int M, float theta,
float loop_bw,
float fmin, float fmax,
- float mu, float gain_mu,
+ float mu, float gain_mu,
float omega, float gain_omega,
float omega_rel)
: block("mpsk_receiver_cc",
- io_signature::make(1, 1, sizeof(gr_complex)),
- io_signature::make(1, 1, sizeof(gr_complex))),
- blocks::control_loop(loop_bw, fmax, fmin),
- d_M(M), d_theta(theta),
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
+ blocks::control_loop(loop_bw, fmax, fmin),
+ d_M(M), d_theta(theta),
d_current_const_point(0),
- d_mu(mu), d_gain_mu(gain_mu), d_gain_omega(gain_omega),
+ d_mu(mu), d_gain_mu(gain_mu), d_gain_omega(gain_omega),
d_omega_rel(omega_rel), d_max_omega(0), d_min_omega(0),
d_p_2T(0), d_p_1T(0), d_p_0T(0), d_c_2T(0), d_c_1T(0), d_c_0T(0)
{
@@ -78,13 +78,13 @@ namespace gr {
throw std::out_of_range("clock rate must be > 0");
if(gain_mu < 0 || gain_omega < 0)
throw std::out_of_range("Gains must be non-negative");
-
+
assert(d_interp->ntaps() <= DLLEN);
-
+
// zero double length delay line.
for(unsigned int i = 0; i < 2 * DLLEN; i++)
d_dl[i] = gr_complex(0.0,0.0);
-
+
set_modulation_order(d_M);
}
@@ -98,7 +98,7 @@ namespace gr {
{
// build the constellation vector from M
make_constellation();
-
+
// Select a phase detector and a decision maker for the modulation order
switch(d_M) {
case 2: // optimized algorithms for BPSK
@@ -150,7 +150,7 @@ namespace gr {
else
phase_error = -sample.real();
}
-
+
return phase_error;
}
@@ -193,7 +193,7 @@ namespace gr {
// the Euclidean distance (error) with the sample
for(unsigned int m = 0; m < d_M; m++) {
gr_complex diff = norm(d_constellation[m] - sample);
-
+
if(fabs(diff.real()) < min_s) {
min_s = fabs(diff.real());
min_m = m;
@@ -224,10 +224,10 @@ namespace gr {
d_phase -= M_TWOPI;
while(d_phase < -M_TWOPI)
d_phase += M_TWOPI;
-
+
nco = gr_expj(d_phase+d_theta); // get the NCO value for derotating the current sample
sample = nco*symbol; // get the downconverted symbol
-
+
// Fill up the delay line for the interpolator
d_dl[d_dl_idx] = sample;
d_dl[(d_dl_idx + DLLEN)] = sample; // put this in the second half of the buffer for overflows
@@ -248,24 +248,24 @@ namespace gr {
d_p_0T = sample;
d_c_2T = d_c_1T;
d_c_1T = d_c_0T;
-
+
d_current_const_point = (*this.*d_decision)(d_p_0T); // make a decision on the sample value
d_c_0T = d_constellation[d_current_const_point];
-
+
x = (d_c_0T - d_c_2T) * conj(d_p_1T);
y = (d_p_0T - d_p_2T) * conj(d_c_1T);
u = y - x;
mm_error = u.real(); // the error signal is in the real part
mm_error = gr::branchless_clip(mm_error, 1.0); // limit mm_val
-
+
d_omega = d_omega + d_gain_omega * mm_error; // update omega based on loop error
d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_rel); // make sure we don't walk away
-
+
d_mu += d_omega + d_gain_mu * mm_error; // update mu based on loop error
-
+
#if VERBOSE_MM
- printf("mm: mu: %f omega: %f mm_error: %f sample: %f+j%f constellation: %f+j%f\n",
- d_mu, d_omega, mm_error, sample.real(), sample.imag(),
+ printf("mm: mu: %f omega: %f mm_error: %f sample: %f+j%f constellation: %f+j%f\n",
+ d_mu, d_omega, mm_error, sample.real(), sample.imag(),
d_constellation[d_current_const_point].real(), d_constellation[d_current_const_point].imag());
#endif
}
@@ -278,14 +278,14 @@ namespace gr {
// Make phase and frequency corrections based on sampled value
phase_error = (*this.*d_phase_error_detector)(sample);
-
+
advance_loop(phase_error);
phase_wrap();
frequency_limit();
-
+
#if VERBOSE_COSTAS
printf("cl: phase_error: %f phase: %f freq: %f sample: %f+j%f constellation: %f+j%f\n",
- phase_error, d_phase, d_freq, sample.real(), sample.imag(),
+ phase_error, d_phase, d_freq, sample.real(), sample.imag(),
d_constellation[d_current_const_point].real(), d_constellation[d_current_const_point].imag());
#endif
}
@@ -306,7 +306,7 @@ namespace gr {
mm_sampler(in[i]); // puts symbols into a buffer and adjusts d_mu
i++;
}
-
+
if(i < ninput_items[0]) {
gr_complex interp_sample = d_interp->interpolate(&d_dl[d_dl_idx], d_mu);
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h
index 8e404da54e..48a9e43e58 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.h
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.h
@@ -35,10 +35,10 @@ namespace gr {
class mpsk_receiver_cc_impl : public mpsk_receiver_cc
{
public:
- mpsk_receiver_cc_impl(unsigned int M, float theta,
+ mpsk_receiver_cc_impl(unsigned int M, float theta,
float loop_bw,
float fmin, float fmax,
- float mu, float gain_mu,
+ float mu, float gain_mu,
float omega, float gain_omega, float omega_rel);
~mpsk_receiver_cc_impl();
@@ -77,9 +77,9 @@ namespace gr {
//! Sets value of mu
void set_mu(float mu) { d_mu = mu; }
-
- //! Sets value of omega and its min and max values
- void set_omega(float omega) {
+
+ //! Sets value of omega and its min and max values
+ void set_omega(float omega) {
d_omega = omega;
d_min_omega = omega*(1.0 - d_omega_rel);
d_max_omega = omega*(1.0 + d_omega_rel);
@@ -94,7 +94,7 @@ namespace gr {
//! Sets the relative omega limit and resets omega min/max values
void set_gain_omega_rel(float omega_rel);
-
+
protected:
void make_constellation();
void mm_sampler(const gr_complex symbol);
@@ -172,7 +172,7 @@ namespace gr {
* \returns the index to d_constellation that minimizes the error/
*/
unsigned int decision_bpsk(gr_complex sample) const;
-
+
/*!
* \brief Decision maker for QPSK constellation.
*
@@ -191,7 +191,7 @@ namespace gr {
float d_theta;
/*!
- * \brief Decision maker function pointer
+ * \brief Decision maker function pointer
*
* \param sample the baseband I&Q sample from which to make the decision
*
@@ -213,7 +213,7 @@ namespace gr {
gr_complex d_c_2T, d_c_1T, d_c_0T;
/*!
- * \brief Phase error detector function pointer
+ * \brief Phase error detector function pointer
*
* \param sample the I&Q sample from which to determine the phase error
*
@@ -225,13 +225,13 @@ namespace gr {
//! get interpolated value
gr::filter::mmse_fir_interpolator_cc *d_interp;
-
+
//! delay line length.
static const unsigned int DLLEN = 8;
-
+
//! delay line plus some length for overflow protection
__GR_ATTR_ALIGNED(8) gr_complex d_dl[2*DLLEN];
-
+
//! index to delay line
unsigned int d_dl_idx;
};
diff --git a/gr-digital/python/digital/gmsk.py b/gr-digital/python/digital/gmsk.py
index 9a44837002..012c91f9d0 100644
--- a/gr-digital/python/digital/gmsk.py
+++ b/gr-digital/python/digital/gmsk.py
@@ -66,7 +66,7 @@ class gmsk_mod(gr.hier_block2):
samples_per_symbol: samples per baud >= 2 (integer)
bt: Gaussian filter bandwidth * symbol time (float)
verbose: Print information about modulator? (boolean)
- debug: Print modulation data to files? (boolean)
+ log: Print modulation data to files? (boolean)
"""
def __init__(self,
@@ -176,12 +176,12 @@ class gmsk_demod(gr.hier_block2):
Args:
samples_per_symbol: samples per baud (integer)
- verbose: Print information about modulator? (boolean)
- log: Print modualtion data to files? (boolean)
gain_mu: controls rate of mu adjustment (float)
mu: fractional delay [0.0, 1.0] (float)
omega_relative_limit: sets max variation in omega (float)
freq_error: bit rate error as a fraction (float)
+ verbose: Print information about modulator? (boolean)
+ log: Print modualtion data to files? (boolean)
"""
def __init__(self,
diff --git a/gr-digital/python/digital/packet_utils.py b/gr-digital/python/digital/packet_utils.py
index 865f3adbb4..d7aa4e66ca 100644
--- a/gr-digital/python/digital/packet_utils.py
+++ b/gr-digital/python/digital/packet_utils.py
@@ -113,7 +113,9 @@ def make_packet(payload, samples_per_symbol, bits_per_symbol,
bits_per_symbol: (needed for padding calculation) (int)
preamble: string of ascii 0's and 1's
access_code: string of ascii 0's and 1's
+ pad_for_usrp: If true, packets are padded such that they end up a multiple of 128 samples(512 bytes)
whitener_offset: offset into whitener string to use [0-16)
+ whitening: Whether to turn on data whitening(scrambling) (boolean)
Packet will have access code at the beginning, followed by length, payload
and finally CRC-32.
diff --git a/gr-digital/python/digital/psk.py b/gr-digital/python/digital/psk.py
index 1816ffb4ba..0e0c65ea2b 100644
--- a/gr-digital/python/digital/psk.py
+++ b/gr-digital/python/digital/psk.py
@@ -85,9 +85,15 @@ class psk_mod(generic_mod):
"""
Hierarchical block for RRC-filtered PSK modulation.
- The input is a byte stream (unsigned char) and the
- output is the complex modulated signal at baseband.
-
+ The input is a byte stream (unsigned char), treated as a series of packed
+ symbols. Symbols are grouped from MSB to LSB.
+
+ The output is the complex modulated signal at baseband, with a given number
+ of samples per symbol.
+
+ If "Samples/Symbol" is 2, and "Number of Constellation Points" is 4, a
+ single byte contains four symbols, and will produce eight samples.
+
Args:
constellation_points: Number of constellation points (must be a power of two) (integer).
mod_code: Whether to use a gray_code (digital.mod_codes.GRAY_CODE) or not (digital.mod_codes.NO_CODE).
@@ -113,8 +119,10 @@ class psk_demod(generic_demod):
"""
Hierarchical block for RRC-filtered PSK modulation.
- The input is a byte stream (unsigned char) and the
- output is the complex modulated signal at baseband.
+ The input is a complex modulated signal at baseband.
+
+ The output is a stream of bytes, each representing a recovered bit.
+ The most significant bit is reported first.
Args:
constellation_points: Number of constellation points (must be a power of two) (integer).
diff --git a/gr-digital/python/digital/qa_hdlc_framer.py b/gr-digital/python/digital/qa_hdlc_framer.py
new file mode 100755
index 0000000000..f8d1923de1
--- /dev/null
+++ b/gr-digital/python/digital/qa_hdlc_framer.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+#
+# Copyright 2006,2007,2010,2011,2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest, digital, blocks
+import pmt
+import numpy
+from time import sleep
+
+class test_hdlc_framer(gr_unittest.TestCase):
+ def setUp(self):
+ self.tb = gr.top_block()
+
+ def tearDown(self):
+ self.tb = None
+
+ def test_001(self):
+ #test complementary operation of framer & deframer
+ #want to frame some random data that has enough consecutive bits to
+ #stuff at least a few bits
+ npkts = 20
+ src_data = [0xFE, 0xDA, 0xAC, 0x29, 0x7F, 0xA2, 0x90, 0x0F, 0xF8]
+ frame = digital.hdlc_framer_pb("wat")
+ corr = digital.correlate_access_code_tag_bb("01111110", 0, "frame")
+ deframe = digital.hdlc_deframer_bp("frame", 32, 500)
+ debug = blocks.message_debug()
+ self.tb.connect(frame, corr, deframe)
+ self.tb.msg_connect(deframe, "out", debug, "store")
+ self.tb.start()
+ msg = pmt.cons(pmt.PMT_NIL, pmt.init_u8vector(len(src_data),src_data))
+ for i in xrange(npkts):
+ frame.to_basic_block()._post(pmt.intern("in"), msg)
+ sleep(0.2)
+ self.tb.stop()
+ self.tb.wait()
+ rxmsg = debug.get_message(0)
+ result_len = pmt.blob_length(pmt.cdr(rxmsg))
+ msg_data = []
+ for j in xrange(result_len):
+ msg_data.append(pmt.u8vector_ref(pmt.cdr(rxmsg), j))
+ self.assertEqual(src_data, msg_data)
+
+
+if __name__ == '__main__':
+ gr_unittest.run(test_hdlc_framer, "test_hdlc_framer.xml")
+
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index 5a0cb4f415..ab9794af57 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -67,6 +67,8 @@
#include "gnuradio/digital/framer_sink_1.h"
#include "gnuradio/digital/glfsr_source_b.h"
#include "gnuradio/digital/glfsr_source_f.h"
+#include "gnuradio/digital/hdlc_deframer_bp.h"
+#include "gnuradio/digital/hdlc_framer_pb.h"
#include "gnuradio/digital/header_payload_demux.h"
#include "gnuradio/digital/kurtotic_equalizer_cc.h"
#include "gnuradio/digital/lfsr.h"
@@ -138,6 +140,8 @@
%include "gnuradio/digital/framer_sink_1.h"
%include "gnuradio/digital/glfsr_source_b.h"
%include "gnuradio/digital/glfsr_source_f.h"
+%include "gnuradio/digital/hdlc_deframer_bp.h"
+%include "gnuradio/digital/hdlc_framer_pb.h"
%include "gnuradio/digital/header_payload_demux.h"
%include "gnuradio/digital/kurtotic_equalizer_cc.h"
%include "gnuradio/digital/lfsr.h"
@@ -203,6 +207,8 @@ GR_SWIG_BLOCK_MAGIC2(digital, fll_band_edge_cc);
GR_SWIG_BLOCK_MAGIC2(digital, framer_sink_1);
GR_SWIG_BLOCK_MAGIC2(digital, glfsr_source_b);
GR_SWIG_BLOCK_MAGIC2(digital, glfsr_source_f);
+GR_SWIG_BLOCK_MAGIC2(digital, hdlc_deframer_bp);
+GR_SWIG_BLOCK_MAGIC2(digital, hdlc_framer_pb);
GR_SWIG_BLOCK_MAGIC2(digital, header_payload_demux);
GR_SWIG_BLOCK_MAGIC2(digital, kurtotic_equalizer_cc);
GR_SWIG_BLOCK_MAGIC2(digital, lms_dd_equalizer_cc);
diff --git a/gr-filter/examples/channelizer_demo.grc b/gr-filter/examples/channelizer_demo.grc
new file mode 100644
index 0000000000..b7b4c1cb79
--- /dev/null
+++ b/gr-filter/examples/channelizer_demo.grc
@@ -0,0 +1,1265 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+ <timestamp>Thu Mar 27 13:33:38 2014</timestamp>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>top_block</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value></value>
+ </param>
+ <param>
+ <key>author</key>
+ <value></value>
+ </param>
+ <param>
+ <key>description</key>
+ <value></value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>qt_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>run_options</key>
+ <value>prompt</value>
+ </param>
+ <param>
+ <key>run</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>max_nouts</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>32000</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(179, 9)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>analog_sig_source_x</key>
+ <param>
+ <key>id</key>
+ <value>analog_sig_source_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>waveform</key>
+ <value>analog.GR_COS_WAVE</value>
+ </param>
+ <param>
+ <key>freq</key>
+ <value>0.03 * samp_rate</value>
+ </param>
+ <param>
+ <key>amp</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>offset</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(12, 71)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>analog_sig_source_x</key>
+ <param>
+ <key>id</key>
+ <value>analog_sig_source_x_1</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>waveform</key>
+ <value>analog.GR_COS_WAVE</value>
+ </param>
+ <param>
+ <key>freq</key>
+ <value>0.38 * samp_rate</value>
+ </param>
+ <param>
+ <key>amp</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>offset</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(11, 177)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>qtgui_freq_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_freq_sink_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>fftsize</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>wintype</key>
+ <value>firdes.WIN_BLACKMAN_hARRIS</value>
+ </param>
+ <param>
+ <key>fc</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>bw</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-140</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value></value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(352, 35)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>blocks_add_xx</key>
+ <param>
+ <key>id</key>
+ <value>blocks_add_xx_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>num_inputs</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(228, 177)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>pfb_channelizer_hier_ccf</key>
+ <param>
+ <key>id</key>
+ <value>pfb_channelizer_hier_ccf_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>nchans</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>n_filterbanks</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>taps</key>
+ <value>None</value>
+ </param>
+ <param>
+ <key>outchans</key>
+ <value>None</value>
+ </param>
+ <param>
+ <key>atten</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>bw</key>
+ <value>0.6</value>
+ </param>
+ <param>
+ <key>tb</key>
+ <value>0.2</value>
+ </param>
+ <param>
+ <key>ripple</key>
+ <value>0.1</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(333, 163)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>qtgui_freq_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_freq_sink_x_0_2</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>fftsize</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>wintype</key>
+ <value>firdes.WIN_BLACKMAN_hARRIS</value>
+ </param>
+ <param>
+ <key>fc</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>bw</key>
+ <value>samp_rate/3.0</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-140</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value></value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(768, 63)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>qtgui_freq_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_freq_sink_x_0_1</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>fftsize</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>wintype</key>
+ <value>firdes.WIN_BLACKMAN_hARRIS</value>
+ </param>
+ <param>
+ <key>fc</key>
+ <value>samp_rate/3.0</value>
+ </param>
+ <param>
+ <key>bw</key>
+ <value>samp_rate/3.0</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-140</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value></value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(768, 177)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>analog_sig_source_x</key>
+ <param>
+ <key>id</key>
+ <value>analog_sig_source_x_2</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>waveform</key>
+ <value>analog.GR_COS_WAVE</value>
+ </param>
+ <param>
+ <key>freq</key>
+ <value>0.70*samp_rate</value>
+ </param>
+ <param>
+ <key>amp</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>offset</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(8, 282)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>qtgui_freq_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>qtgui_freq_sink_x_0_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ </param>
+ <param>
+ <key>fftsize</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>wintype</key>
+ <value>firdes.WIN_BLACKMAN_hARRIS</value>
+ </param>
+ <param>
+ <key>fc</key>
+ <value>-samp_rate/3.0</value>
+ </param>
+ <param>
+ <key>bw</key>
+ <value>samp_rate/3.0</value>
+ </param>
+ <param>
+ <key>autoscale</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>ymin</key>
+ <value>-140</value>
+ </param>
+ <param>
+ <key>ymax</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>nconnections</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>update_time</key>
+ <value>0.10</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value></value>
+ </param>
+ <param>
+ <key>label1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color1</key>
+ <value>"blue"</value>
+ </param>
+ <param>
+ <key>alpha1</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width2</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color2</key>
+ <value>"red"</value>
+ </param>
+ <param>
+ <key>alpha2</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label3</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color3</key>
+ <value>"green"</value>
+ </param>
+ <param>
+ <key>alpha3</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label4</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width4</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color4</key>
+ <value>"black"</value>
+ </param>
+ <param>
+ <key>alpha4</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label5</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width5</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color5</key>
+ <value>"cyan"</value>
+ </param>
+ <param>
+ <key>alpha5</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label6</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color6</key>
+ <value>"magenta"</value>
+ </param>
+ <param>
+ <key>alpha6</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>"yellow"</value>
+ </param>
+ <param>
+ <key>alpha7</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>"dark red"</value>
+ </param>
+ <param>
+ <key>alpha8</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>width9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>"dark green"</value>
+ </param>
+ <param>
+ <key>alpha9</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(769, 287)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <connection>
+ <source_block_id>analog_sig_source_x_1</source_block_id>
+ <sink_block_id>blocks_add_xx_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>1</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>analog_sig_source_x_0</source_block_id>
+ <sink_block_id>blocks_add_xx_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blocks_add_xx_0</source_block_id>
+ <sink_block_id>pfb_channelizer_hier_ccf_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>analog_sig_source_x_2</source_block_id>
+ <sink_block_id>blocks_add_xx_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>2</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blocks_add_xx_0</source_block_id>
+ <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>pfb_channelizer_hier_ccf_0</source_block_id>
+ <sink_block_id>qtgui_freq_sink_x_0_2</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>pfb_channelizer_hier_ccf_0</source_block_id>
+ <sink_block_id>qtgui_freq_sink_x_0_1</sink_block_id>
+ <source_key>1</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>pfb_channelizer_hier_ccf_0</source_block_id>
+ <sink_block_id>qtgui_freq_sink_x_0_0</sink_block_id>
+ <source_key>2</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+</flow_graph>
diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt
index cc5c77ebc6..1315b11c28 100644
--- a/gr-filter/grc/CMakeLists.txt
+++ b/gr-filter/grc/CMakeLists.txt
@@ -23,6 +23,7 @@ install(FILES
filter_fft_filter_xxx.xml
filter_fir_filter_xxx.xml
filter_filter_delay_fc.xml
+ filter_filterbank_vcvcf.xml
filter_fractional_interpolator_xx.xml
filter_fractional_resampler_xx.xml
filter_freq_xlating_fir_filter_xxx.xml
@@ -31,6 +32,7 @@ install(FILES
filter_interp_fir_filter_xxx.xml
filter_pfb_arb_resampler.xml
filter_pfb_channelizer.xml
+ filter_pfb_channelizer_hier.xml
filter_pfb_decimator.xml
filter_pfb_interpolator.xml
filter_pfb_synthesizer.xml
diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml
index 617893ad54..8fe0d17a78 100644
--- a/gr-filter/grc/filter_block_tree.xml
+++ b/gr-filter/grc/filter_block_tree.xml
@@ -40,6 +40,7 @@
<block>dc_blocker_xx</block>
<block>fft_filter_xxx</block>
<block>fir_filter_xxx</block>
+ <block>filterbank_vcvcf</block>
<block>filter_delay_fc</block>
<block>hilbert_fc</block>
<block>iir_filter_ffd</block>
@@ -57,6 +58,7 @@
<name>Channelizers</name>
<block>freq_xlating_fir_filter_xxx</block>
<block>pfb_channelizer_ccf</block>
+ <block>pfb_channelizer_hier_ccf</block>
<block>pfb_decimator_ccf</block>
<block>pfb_interpolator_ccf</block>
<block>pfb_synthesizer_ccf</block>
diff --git a/gr-filter/grc/filter_filterbank_vcvcf.xml b/gr-filter/grc/filter_filterbank_vcvcf.xml
new file mode 100644
index 0000000000..c8175358d1
--- /dev/null
+++ b/gr-filter/grc/filter_filterbank_vcvcf.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Generic Filterbank
+###################################################
+ -->
+<block>
+ <name>Generic Filterbank</name>
+ <key>filterbank_vcvcf</key>
+ <import>from gnuradio import filter</import>
+ <make>filter.filterbank_vcvcf($taps)</make>
+ <callback>set_taps($taps)</callback>
+ <param>
+ <name>Taps(list of lists)</name>
+ <key>taps</key>
+ <value></value>
+ <type>raw</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>len($taps)</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ <vlen>len($taps)</vlen>
+ </source>
+</block>
diff --git a/gr-filter/grc/filter_pfb_channelizer_hier.xml b/gr-filter/grc/filter_pfb_channelizer_hier.xml
new file mode 100644
index 0000000000..356187d90c
--- /dev/null
+++ b/gr-filter/grc/filter_pfb_channelizer_hier.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Hierarchical Polyphase Channelizer
+###################################################
+ -->
+<block>
+ <name>Hierarchical Polyphase Channelizer</name>
+ <key>pfb_channelizer_hier_ccf</key>
+ <import>from gnuradio.filter import pfb</import>
+ <make>pfb.channelizer_hier_ccf(
+ $nchans,
+ $n_filterbanks,
+ $taps,
+ $outchans,
+ $atten,
+ $bw,
+ $tb,
+ $ripple
+ )
+ </make>
+ <callback>set_taps($taps)</callback>
+ <param>
+ <name>Number of Channels</name>
+ <key>nchans</key>
+ <value>3</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Number of Filterbanks</name>
+ <key>n_filterbanks</key>
+ <value>4</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <value>None</value>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>Output Channels</name>
+ <key>outchans</key>
+ <value>None</value>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>Attenuation</name>
+ <key>atten</key>
+ <value>100</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Fraction of Channel to Keep</name>
+ <key>bw</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Transition Band (as a fraction of channel width)</name>
+ <key>tb</key>
+ <value>0.2</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Passband Ripple in dB</name>
+ <key>ripple</key>
+ <value>0.1</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ <nports>$nchans</nports>
+ </source>
+</block>
diff --git a/gr-filter/include/gnuradio/filter/CMakeLists.txt b/gr-filter/include/gnuradio/filter/CMakeLists.txt
index 9dbc227887..1af91a6067 100644
--- a/gr-filter/include/gnuradio/filter/CMakeLists.txt
+++ b/gr-filter/include/gnuradio/filter/CMakeLists.txt
@@ -89,6 +89,8 @@ install(FILES
mmse_fir_interpolator_ff.h
pm_remez.h
polyphase_filterbank.h
+ filterbank.h
+ filterbank_vcvcf.h
single_pole_iir.h
dc_blocker_cc.h
dc_blocker_ff.h
diff --git a/gr-filter/include/gnuradio/filter/filterbank.h b/gr-filter/include/gnuradio/filter/filterbank.h
new file mode 100644
index 0000000000..f71d6c9fdd
--- /dev/null
+++ b/gr-filter/include/gnuradio/filter/filterbank.h
@@ -0,0 +1,97 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012, 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef INCLUDED_FILTER_FILTERBANK_H
+#define INCLUDED_FILTER_FILTERBANK_H
+
+#include <gnuradio/filter/api.h>
+#include <gnuradio/filter/fir_filter.h>
+
+namespace gr {
+ namespace filter {
+ namespace kernel {
+
+ /*!
+ * \brief A filter bank with generic taps.
+ *
+ * This block takes in a vector of N complex inputs, passes
+ * them through N FIR filters, and outputs a vector of N complex
+ * outputs.
+ *
+ * The only advantage of using this block over N individual
+ * FIR filter blocks is that it places less of a load on the
+ * scheduler.
+ *
+ * The number of filters cannot be changed dynamically, however
+ * filters can be deactivated (i.e. no processing is done for
+ * them) by passing a vector of filter taps containing all zeros
+ * to them. In this case their entry in the output vector is a
+ * zero.
+ *
+ */
+
+ class FILTER_API filterbank
+ {
+ protected:
+ unsigned int d_nfilts;
+ unsigned int d_ntaps;
+ std::vector<kernel::fir_filter_ccf*> d_fir_filters;
+ std::vector< std::vector<float> > d_taps;
+ std::vector<bool> d_active;
+ unsigned int d_taps_per_filter;
+
+ public:
+ /*!
+ * Build the filterbank.
+ *
+ * \param taps (vector of vector of floats / list of list of floats)
+ * Populates the filters.
+ */
+ filterbank(const std::vector<std::vector<float> > &taps);
+
+ ~filterbank();
+
+ /*!
+ * Update the filterbank's filter taps.
+ *
+ * \param taps (vector of vector of floats / list of list of floats)
+ * The prototype filter to populate the filterbank.
+ */
+ virtual void set_taps(const std::vector<std::vector<float> > &taps);
+
+ /*!
+ * Print all of the filterbank taps to screen.
+ */
+ void print_taps();
+
+ /*!
+ * Return a vector<vector<>> of the filterbank taps
+ */
+ std::vector<std::vector<float> > taps() const;
+ };
+
+ } /* namespace kernel */
+ } /* namespace filter */
+} /* namespace gr */
+
+#endif /* INCLUDED_FILTER_FILTERBANK_H */
diff --git a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h
new file mode 100644
index 0000000000..dfacc24517
--- /dev/null
+++ b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h
@@ -0,0 +1,76 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2010,2012,2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef INCLUDED_FILTER_FILTERBANK_CHANNELIZER_VCVCF_H
+#define INCLUDED_FILTER_FILTERBANK_CHANNELIZER_VCVCF_H
+
+#include <gnuradio/filter/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+ namespace filter {
+
+ /*!
+ * \brief Filterbank with vector of gr_complex input,
+ * vector of gr_complex output and float taps
+ * \ingroup filter_blk
+ *
+ * \details
+ * This block takes in complex vectors and outputs complex vectors of the same
+ * size. Vectors of length N, rather than N normal streams are used to reduce
+ * overhead.
+ */
+ class FILTER_API filterbank_vcvcf : virtual public block
+ {
+ public:
+ typedef boost::shared_ptr<filterbank_vcvcf> sptr;
+
+ /*!
+ * Build the filterbank.
+ * \param taps (vector of vector of floats/list of list of floats)
+ * Used to populate the filters.
+ */
+ static sptr make(const std::vector< std::vector<float> > &taps);
+
+ /*!
+ * Resets the filterbank's filter taps with the new prototype filter
+ * \param taps (vector/list of floats) The prototype filter to populate the filterbank.
+ */
+ virtual void set_taps(const std::vector< std::vector<float> > &taps) = 0;
+
+ /*!
+ * Print all of the filterbank taps to screen.
+ */
+ virtual void print_taps() = 0;
+
+ /*!
+ * Return a vector<vector<>> of the filterbank taps
+ */
+ virtual std::vector<std::vector<float> > taps() const = 0;
+
+ };
+
+ } /* namespace filter */
+} /* namespace gr */
+
+#endif /* INCLUDED_FILTER_PFB_CHANNELIZER_VCVCF_H */
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index 27d1e0d013..0e444d5b5d 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -127,6 +127,8 @@ list(APPEND filter_sources
dc_blocker_cc_impl.cc
dc_blocker_ff_impl.cc
filter_delay_fc_impl.cc
+ filterbank.cc
+ filterbank_vcvcf_impl.cc
fft_filter_ccc_impl.cc
fft_filter_ccf_impl.cc
fft_filter_fff_impl.cc
diff --git a/gr-filter/lib/filterbank.cc b/gr-filter/lib/filterbank.cc
new file mode 100644
index 0000000000..516d0aaccb
--- /dev/null
+++ b/gr-filter/lib/filterbank.cc
@@ -0,0 +1,112 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012,2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/filter/filterbank.h>
+#include <cstdio>
+#include <iostream>
+#include <stdexcept>
+
+namespace gr {
+ namespace filter {
+ namespace kernel {
+
+ filterbank::filterbank(const std::vector<std::vector<float> > &taps)
+ : d_taps(taps)
+ {
+ d_nfilts = d_taps.size();
+ d_fir_filters = std::vector<kernel::fir_filter_ccf*>(d_nfilts);
+ if (d_nfilts == 0) {
+ throw std::invalid_argument("The taps vector may not be empty.");
+ }
+ d_active.resize(d_nfilts);
+ // Create an FIR filter for each channel and zero out the taps
+ std::vector<float> vtaps(1, 0.0f);
+ for(unsigned int i = 0; i < d_nfilts; i++) {
+ d_fir_filters[i] = new kernel::fir_filter_ccf(1, vtaps);
+ }
+ // Now, actually set the filters' taps
+ set_taps(d_taps);
+ }
+
+ filterbank::~filterbank()
+ {
+ for(unsigned int i = 0; i < d_nfilts; i++) {
+ delete d_fir_filters[i];
+ }
+ }
+
+ void
+ filterbank::set_taps(const std::vector<std::vector<float> > &taps)
+ {
+ d_taps = taps;
+ // Check that the number of filters is correct.
+ if (d_nfilts != d_taps.size()) {
+ throw std::runtime_error("The number of filters is incorrect.");
+ }
+ // Check that taps contains vectors of taps, where each vector
+ // is the same length.
+ d_ntaps = d_taps[0].size();
+ for (unsigned int i = 1; i < d_nfilts; i++) {
+ if (d_taps[i].size() != d_ntaps) {
+ throw std::runtime_error("All sets of taps must be of the same length.");
+ }
+ }
+ for(unsigned int i = 0; i < d_nfilts; i++) {
+ // If filter taps are all zeros don't bother to crunch the numbers.
+ d_active[i] = false;
+ for (unsigned int j = 0; j < d_ntaps; j++) {
+ if (d_taps[i][j] != 0) {
+ d_active[i] = true;
+ break;
+ }
+ }
+
+ d_fir_filters[i]->set_taps(d_taps[i]);
+ }
+ }
+
+ void
+ filterbank::print_taps()
+ {
+ unsigned int i, j;
+ for(i = 0; i < d_nfilts; i++) {
+ printf("filter[%d]: [", i);
+ for(j = 0; j < d_taps_per_filter; j++) {
+ printf(" %.4e", d_taps[i][j]);
+ }
+ printf("]\n\n");
+ }
+ }
+
+ std::vector< std::vector<float> >
+ filterbank::taps() const
+ {
+ return d_taps;
+ }
+
+ } /* namespace kernel */
+ } /* namespace filter */
+} /* namespace gr */
diff --git a/gr-filter/lib/filterbank_vcvcf_impl.cc b/gr-filter/lib/filterbank_vcvcf_impl.cc
new file mode 100644
index 0000000000..93c26bbdb8
--- /dev/null
+++ b/gr-filter/lib/filterbank_vcvcf_impl.cc
@@ -0,0 +1,125 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2010,2012,2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "filterbank_vcvcf_impl.h"
+#include <gnuradio/io_signature.h>
+#include <stdio.h>
+#include <iostream>
+
+namespace gr {
+ namespace filter {
+
+ filterbank_vcvcf::sptr
+ filterbank_vcvcf::make(const std::vector<std::vector<float> > &taps)
+ {
+ return gnuradio::get_initial_sptr(new filterbank_vcvcf_impl(taps));
+ }
+
+ filterbank_vcvcf_impl::filterbank_vcvcf_impl(
+ const std::vector< std::vector<float> > &taps)
+ : block("filterbank_vcvcf",
+ io_signature::make(1, 1, sizeof(gr_complex)*taps.size()),
+ io_signature::make(1, 1, sizeof(gr_complex)*taps.size())),
+ filterbank(taps)
+ {
+ set_history(d_ntaps+1);
+ }
+
+ filterbank_vcvcf_impl::~filterbank_vcvcf_impl()
+ {
+ }
+
+ void
+ filterbank_vcvcf_impl::set_taps(const std::vector<std::vector<float> > &taps)
+ {
+ gr::thread::scoped_lock guard(d_mutex);
+ filterbank::set_taps(taps);
+ set_history(d_ntaps+1);
+ d_updated = true;
+ }
+
+ void
+ filterbank_vcvcf_impl::print_taps()
+ {
+ filterbank::print_taps();
+ }
+
+ std::vector<std::vector<float> >
+ filterbank_vcvcf_impl::taps() const
+ {
+ return filterbank::taps();
+ }
+
+ int
+ filterbank_vcvcf_impl::general_work(
+ int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ gr::thread::scoped_lock guard(d_mutex);
+
+ gr_complex *in = (gr_complex*)input_items[0];
+ gr_complex *out = (gr_complex*)output_items[0];
+
+ if(d_updated) {
+ d_updated = false;
+ return 0; // history requirements may have changed.
+ }
+
+ size_t noutputs = output_items.size();
+
+ gr_complex *working;
+
+ working = new gr_complex [noutput_items + d_ntaps];
+
+ for (unsigned int i = 0; i < d_nfilts; i++) {
+ // Only call the filter method on active filters.
+ if (d_active[i]) {
+ for (unsigned int j = 0; j < noutput_items + d_ntaps-1; j++) {
+ unsigned int p = i + j*d_nfilts;
+ working[j] = in[p];
+ }
+ for (unsigned int j = 0; j < (unsigned int)(noutput_items); j++) {
+ unsigned int p = i + j*d_nfilts;
+ out[p] = d_fir_filters[i]->filter(working + j);
+ }
+ } else {
+ // Otherwise just output 0s.
+ for (unsigned int j = 0; j < (unsigned int)(noutput_items); j++) {
+ unsigned int p = i + j*d_nfilts;
+ out[p] = 0;
+ }
+ }
+ }
+
+ delete [] working;
+ consume_each(noutput_items);
+ return noutput_items;
+ }
+
+ } /* namespace filter */
+} /* namespace gr */
diff --git a/gr-filter/lib/filterbank_vcvcf_impl.h b/gr-filter/lib/filterbank_vcvcf_impl.h
new file mode 100644
index 0000000000..49fa1d0e68
--- /dev/null
+++ b/gr-filter/lib/filterbank_vcvcf_impl.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2010,2012,2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_FILTER_FILTERBANK_VCVCF_IMPL_H
+#define INCLUDED_FILTER_FILTERBANK_VCVCF_IMPL_H
+
+#include <gnuradio/filter/filterbank_vcvcf.h>
+#include <gnuradio/filter/filterbank.h>
+#include <gnuradio/filter/fir_filter.h>
+#include <gnuradio/thread/thread.h>
+
+namespace gr {
+ namespace filter {
+
+ class FILTER_API filterbank_vcvcf_impl : public filterbank_vcvcf, kernel::filterbank
+ {
+ private:
+ bool d_updated;
+ gr::thread::mutex d_mutex; // mutex to protect set/work access
+
+ public:
+ filterbank_vcvcf_impl(const std::vector<std::vector<float> > &taps);
+ ~filterbank_vcvcf_impl();
+
+ void set_taps(const std::vector<std::vector<float> > &taps);
+ void print_taps();
+ std::vector<std::vector<float> > taps() const;
+
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } /* namespace filter */
+} /* namespace gr */
+
+#endif
diff --git a/gr-filter/python/filter/pfb.py b/gr-filter/python/filter/pfb.py
index 7ba19ec299..070412503b 100644
--- a/gr-filter/python/filter/pfb.py
+++ b/gr-filter/python/filter/pfb.py
@@ -20,9 +20,10 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr
+import optfir, math
+
+from gnuradio import gr, fft
import filter_swig as filter
-import optfir
try:
from gnuradio import blocks
@@ -379,3 +380,81 @@ class arb_resampler_ccc(gr.hier_block2):
def set_rate(self, rate):
self.pfb.set_rate(rate)
+
+
+class channelizer_hier_ccf(gr.hier_block2):
+ """
+ Make a Polyphase Filter channelizer (complex in, complex out, floating-point taps)
+
+ Args:
+ n_chans - The number of channels to split into.
+ n_filterbanks - The number of filterbank blocks to use (default=2).
+ taps: The taps to use. If this is `None` then taps are generated using optfir.low_pass.
+ outchans - Which channels to output streams for (a list of integers) (default is all channels).
+ atten: Stop band attenuation.
+ bw: The fraction of the channel you want to keep.
+ tb: Transition band with as fraction of channel width.
+ ripple: Pass band ripple in dB.
+ """
+
+ def __init__(self, n_chans, n_filterbanks=1, taps=None, outchans=None,
+ atten=100, bw=1.0, tb=0.2, ripple=0.1):
+ if n_filterbanks > n_chans:
+ n_filterbanks = n_chans
+ if outchans is None:
+ outchans = range(n_chans)
+ gr.hier_block2.__init__(
+ self, "pfb_channelizer_hier_ccf",
+ gr.io_signature(1, 1, gr.sizeof_gr_complex),
+ gr.io_signature(len(outchans), len(outchans), gr.sizeof_gr_complex))
+ if taps is None:
+ taps = optfir.low_pass(1, n_chans, bw, bw+tb, ripple, atten)
+ taps = list(taps)
+ extra_taps = int(math.ceil(1.0*len(taps)/n_chans)*n_chans - len(taps))
+ taps = taps + [0] * extra_taps
+ # Make taps for each channel
+ chantaps = [list(reversed(taps[i: len(taps): n_chans])) for i in range(0, n_chans)]
+ # Convert the input stream into a stream of vectors.
+ self.s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, n_chans)
+ # Create a mapping to separate out each filterbank (a group of channels to be processed together)
+ # And a list of sets of taps for each filterbank.
+ low_cpp = int(n_chans/n_filterbanks)
+ extra = n_chans - low_cpp*n_filterbanks
+ cpps = [low_cpp+1]*extra + [low_cpp]*(n_filterbanks-extra)
+ splitter_mapping = []
+ filterbanktaps = []
+ total = 0
+ for cpp in cpps:
+ splitter_mapping.append([(0, i) for i in range(total, total+cpp)])
+ filterbanktaps.append(chantaps[total: total+cpp])
+ total += cpp
+ assert(total == n_chans)
+ # Split the stream of vectors in n_filterbanks streams of vectors.
+ self.splitter = blocks.vector_map(gr.sizeof_gr_complex, [n_chans], splitter_mapping)
+ # Create the filterbanks
+ self.fbs = [filter.filterbank_vcvcf(taps) for taps in filterbanktaps]
+ # Combine the streams of vectors back into a single stream of vectors.
+ combiner_mapping = [[]]
+ for i, cpp in enumerate(cpps):
+ for j in range(cpp):
+ combiner_mapping[0].append((i, j))
+ self.combiner = blocks.vector_map(gr.sizeof_gr_complex, cpps, combiner_mapping)
+ # Add the final FFT to the channelizer.
+ self.fft = fft.fft_vcc(n_chans, forward=True, window=[1.0]*n_chans)
+ # Select the desired channels
+ if outchans != range(n_chans):
+ selector_mapping = [[(0, i) for i in outchans]]
+ self.selector = blocks.vector_map(gr.sizeof_gr_complex, [n_chans], selector_mapping)
+ # Convert stream of vectors to a normal stream.
+ self.v2ss = blocks.vector_to_streams(gr.sizeof_gr_complex, len(outchans))
+ self.connect(self, self.s2v, self.splitter)
+ for i in range(0, n_filterbanks):
+ self.connect((self.splitter, i), self.fbs[i], (self.combiner, i))
+ self.connect(self.combiner, self.fft)
+ if outchans != range(n_chans):
+ self.connect(self.fft, self.selector, self.v2ss)
+ else:
+ self.connect(self.fft, self.v2ss)
+ for i in range(0, len(outchans)):
+ self.connect((self.v2ss, i), (self, i))
+
diff --git a/gr-filter/python/filter/qa_filterbank.py b/gr-filter/python/filter/qa_filterbank.py
new file mode 100644
index 0000000000..3423b10524
--- /dev/null
+++ b/gr-filter/python/filter/qa_filterbank.py
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+#
+# Copyright 2012,2014 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+import time
+import random
+import math
+
+from gnuradio import gr, gr_unittest, filter, blocks
+
+def convolution(A, B):
+ """
+ Returns a convolution of the A and B vectors of length
+ len(A)-len(B).
+ """
+ rs = []
+ for i in range(len(B)-1, len(A)):
+ r = 0
+ for j, b in enumerate(B):
+ r += A[i-j] * b
+ rs.append(r)
+ return rs
+
+class test_filterbank_vcvcf(gr_unittest.TestCase):
+
+ def setUp(self):
+ self.tb = gr.top_block()
+
+ def tearDown(self):
+ self.tb = None
+
+ def test_000(self):
+ """
+ Generates nfilts sets of random complex data.
+ Generates two sets of random taps for each filter.
+ Applies one set of the random taps, gets some output,
+ applies the second set of random taps, gets some more output,
+ The output is then compared with a python-implemented
+ convolution.
+ """
+ myrand = random.Random(123).random
+ nfilts = 10
+ ntaps = 5
+ # Sets some of the taps to be all zeros.
+ zero_filts1 = (3, 7)
+ zero_filts2 = (1, 6, 9)
+ ndatapoints = 100
+ # Generate some random sets of data
+ data_sets = []
+ for i in range(0, nfilts):
+ data_sets.append([(myrand()-0.5) + (myrand()-0.5)*(0+1j)
+ for k in range(0, ndatapoints)])
+ # Join them together to pass to vector_source block
+ data = []
+ for dp in zip(*data_sets):
+ data += dp
+ # Generate some random taps.
+ taps1 = []
+ taps2 = []
+ for i in range(0, nfilts):
+ if i in zero_filts1:
+ taps1.append([0]*ntaps)
+ else:
+ taps1.append([myrand()-0.5 for k in range(0, ntaps)])
+ if i in zero_filts2:
+ taps2.append([0]*ntaps)
+ else:
+ taps2.append([myrand()-0.5 for k in range(0, ntaps)])
+
+ # Calculate results with a python-implemented convolution.
+ results = []
+ results2 = []
+ for ds, ts, ts2 in zip(data_sets, taps1, taps2):
+ results.append(convolution(ds[-len(ts):]+ds[:-1], ts))
+ results2.append(convolution(ds[-len(ts):]+ds[:-1], ts2))
+ # Convert results from 2D arrays to 1D arrays for ease of comparison.
+ comb_results = []
+ for rs in zip(*results):
+ comb_results += rs
+ comb_results2 = []
+ for rs in zip(*results2):
+ comb_results2 += rs
+ # Construct the signal-processing chain.
+ src = blocks.vector_source_c(data, True, nfilts)
+ fb = filter.filterbank_vcvcf(taps1)
+ v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, nfilts)
+ s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, nfilts*ndatapoints)
+ snk = blocks.probe_signal_vc(nfilts*ndatapoints)
+ self.tb.connect(src, fb, v2s, s2v, snk)
+ # Run the signal-processing chain.
+ self.tb.start()
+ all_zero = True
+ outdata = None
+ waittime = 0.001
+ # Wait until we have some data.
+ while (not outdata) or outdata[0]==0:
+ time.sleep(waittime)
+ outdata = snk.level()
+ # Apply the second set of taps.
+ fb.set_taps(taps2)
+ outdata2 = None
+ # Wait until we have new data.
+ while (not outdata2) or outdata[0] == outdata2[0]:
+ time.sleep(waittime)
+ outdata2 = snk.level()
+ self.tb.stop()
+ # Compare the datasets.
+ self.assertComplexTuplesAlmostEqual(comb_results, outdata, 6)
+ self.assertComplexTuplesAlmostEqual(comb_results2, outdata2, 6)
+
+if __name__ == '__main__':
+ gr_unittest.run(test_filterbank_vcvcf, "test_filterbank_vcvcf.xml")
diff --git a/gr-filter/python/filter/qa_pfb_channelizer.py b/gr-filter/python/filter/qa_pfb_channelizer.py
index 46c6e7b5ae..549e41d7f4 100755
--- a/gr-filter/python/filter/qa_pfb_channelizer.py
+++ b/gr-filter/python/filter/qa_pfb_channelizer.py
@@ -20,8 +20,8 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, filter, blocks
-import math
+from gnuradio import gr, gr_unittest, filter, blocks, analog
+import math, cmath
def sig_source_c(samp_rate, freq, amp, N):
t = map(lambda x: float(x)/samp_rate, xrange(N))
@@ -29,88 +29,126 @@ def sig_source_c(samp_rate, freq, amp, N):
1j*math.sin(2.*math.pi*freq*x), t)
return y
+
class test_pfb_channelizer(gr_unittest.TestCase):
def setUp(self):
self.tb = gr.top_block()
+ self.freqs = [110., -513., 203., -230, 121]
+ # Number of channels to channelize.
+ self.M = len(self.freqs)
+ # Number of samples to use.
+ self.N = 1000
+ # Baseband sampling rate.
+ self.fs = 5000
+ # Input samp rate to channelizer.
+ self.ifs = self.M*self.fs
+
+ self.taps = filter.firdes.low_pass_2(
+ 1, self.ifs, self.fs/2, self.fs/10,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
+
+ self.Ntest = 50
+
def tearDown(self):
self.tb = None
- def test_000(self):
- N = 1000 # number of samples to use
- M = 5 # Number of channels to channelize
- fs = 5000 # baseband sampling rate
- ifs = M*fs # input samp rate to channelizer
-
- taps = filter.firdes.low_pass_2(1, ifs, fs/2, fs/10,
- attenuation_dB=80,
- window=filter.firdes.WIN_BLACKMAN_hARRIS)
-
+ def test_0000(self):
+ self.check_channelizer(filter.pfb.channelizer_ccf(
+ self.M, taps=self.taps, oversample_rate=1))
+
+ def test_0001(self):
+ self.check_channelizer(filter.pfb.channelizer_hier_ccf(
+ self.M, n_filterbanks=1, taps=self.taps))
+
+ def get_input_data(self):
+ """
+ Get the raw data generated by addition of sinusoids.
+ Useful for debugging.
+ """
+ tb = gr.top_block()
+ signals = []
+ add = blocks.add_cc()
+ for i in xrange(len(self.freqs)):
+ f = self.freqs[i] + i*self.fs
+ signals.append(analog.sig_source_c(self.ifs, analog.GR_SIN_WAVE, f, 1))
+ tb.connect(signals[i], (add,i))
+ head = blocks.head(gr.sizeof_gr_complex, self.N)
+ snk = blocks.vector_sink_c()
+ tb.connect(add, head, snk)
+ tb.run()
+ input_data = snk.data()
+ return input_data
+
+ def check_channelizer(self, channelizer_block):
signals = list()
add = blocks.add_cc()
- freqs = [-230., 121., 110., -513., 203.]
- for i in xrange(len(freqs)):
- f = freqs[i] + (M/2-M+i+1)*fs
- data = sig_source_c(ifs, f, 1, N)
+ for i in xrange(len(self.freqs)):
+ f = self.freqs[i] + i*self.fs
+ data = sig_source_c(self.ifs, f, 1, self.N)
signals.append(blocks.vector_source_c(data))
self.tb.connect(signals[i], (add,i))
- s2ss = blocks.stream_to_streams(gr.sizeof_gr_complex, M)
- pfb = filter.pfb_channelizer_ccf(M, taps, 1)
+ #s2ss = blocks.stream_to_streams(gr.sizeof_gr_complex, self.M)
- self.tb.connect(add, s2ss)
+ #self.tb.connect(add, s2ss)
+ self.tb.connect(add, channelizer_block)
snks = list()
- for i in xrange(M):
+ for i in xrange(self.M):
snks.append(blocks.vector_sink_c())
- self.tb.connect((s2ss,i), (pfb,i))
- self.tb.connect((pfb, i), snks[i])
+ #self.tb.connect((s2ss,i), (channelizer_block,i))
+ self.tb.connect((channelizer_block, i), snks[i])
self.tb.run()
- Ntest = 50
L = len(snks[0].data())
- # Adjusted phase rotations for data
- p0 = 0.11058379158914133
- p1 = 4.5108246571401693
- p2 = 3.9739891674564594
- p3 = 2.2820531095511924
- p4 = 1.3782797467397869
+ expected_data = self.get_expected_data(L)
+ received_data = [snk.data() for snk in snks]
+
+ for expected, received in zip(expected_data, received_data):
+ self.compare_data(expected, received)
+
+ def compare_data(self, expected, received):
+ Ntest = 50
+ expected = expected[-Ntest:]
+ received = received[-Ntest:]
+ expected = [x/expected[0] for x in expected]
+ received = [x/received[0] for x in received]
+ self.assertComplexTuplesAlmostEqual(expected, received, 3)
+
+
+ def get_freq(self, data):
+ freqs = []
+ for r1, r2 in zip(data[:-1], data[1:]):
+ diff = cmath.phase(r1) - cmath.phase(r2)
+ if diff > math.pi:
+ diff -= 2*math.pi
+ if diff < -math.pi:
+ diff += 2*math.pi
+ freqs.append(diff)
+ freq = float(sum(freqs))/len(freqs)
+ freq /= 2*math.pi
+ return freq
+
+ def get_expected_data(self, L):
# Filter delay is the normal delay of each arm
- tpf = math.ceil(len(taps) / float(M))
+ tpf = math.ceil(len(self.taps) / float(self.M))
delay = -(tpf - 1.0) / 2.0
delay = int(delay)
# Create a time scale that's delayed to match the filter delay
- t = map(lambda x: float(x)/fs, xrange(delay, L+delay))
+ t = map(lambda x: float(x)/self.fs, xrange(delay, L+delay))
# Create known data as complex sinusoids at the different baseband freqs
# the different channel numbering is due to channelizer output order.
- expected0_data = map(lambda x: math.cos(2.*math.pi*freqs[2]*x+p0) + \
- 1j*math.sin(2.*math.pi*freqs[2]*x+p0), t)
- expected1_data = map(lambda x: math.cos(2.*math.pi*freqs[3]*x+p1) + \
- 1j*math.sin(2.*math.pi*freqs[3]*x+p1), t)
- expected2_data = map(lambda x: math.cos(2.*math.pi*freqs[4]*x+p2) + \
- 1j*math.sin(2.*math.pi*freqs[4]*x+p2), t)
- expected3_data = map(lambda x: math.cos(2.*math.pi*freqs[0]*x+p3) + \
- 1j*math.sin(2.*math.pi*freqs[0]*x+p3), t)
- expected4_data = map(lambda x: math.cos(2.*math.pi*freqs[1]*x+p4) + \
- 1j*math.sin(2.*math.pi*freqs[1]*x+p4), t)
-
- dst0_data = snks[0].data()
- dst1_data = snks[1].data()
- dst2_data = snks[2].data()
- dst3_data = snks[3].data()
- dst4_data = snks[4].data()
-
- self.assertComplexTuplesAlmostEqual(expected0_data[-Ntest:], dst0_data[-Ntest:], 3)
- self.assertComplexTuplesAlmostEqual(expected1_data[-Ntest:], dst1_data[-Ntest:], 3)
- self.assertComplexTuplesAlmostEqual(expected2_data[-Ntest:], dst2_data[-Ntest:], 3)
- self.assertComplexTuplesAlmostEqual(expected3_data[-Ntest:], dst3_data[-Ntest:], 3)
- self.assertComplexTuplesAlmostEqual(expected4_data[-Ntest:], dst4_data[-Ntest:], 3)
+ expected_data = [map(lambda x: math.cos(2.*math.pi*f*x) +
+ 1j*math.sin(2.*math.pi*f*x), t) for f in self.freqs]
+ return expected_data
if __name__ == '__main__':
gr_unittest.run(test_pfb_channelizer, "test_pfb_channelizer.xml")
diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i
index 3eb3f3c634..ec1f522117 100644
--- a/gr-filter/swig/filter_swig.i
+++ b/gr-filter/swig/filter_swig.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2012 Free Software Foundation, Inc.
+ * Copyright 2012,2014 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -33,6 +33,7 @@
#include "gnuradio/filter/dc_blocker_cc.h"
#include "gnuradio/filter/dc_blocker_ff.h"
#include "gnuradio/filter/filter_delay_fc.h"
+#include "gnuradio/filter/filterbank_vcvcf.h"
#include "gnuradio/filter/fir_filter_ccc.h"
#include "gnuradio/filter/fir_filter_ccf.h"
#include "gnuradio/filter/fir_filter_fcc.h"
@@ -82,6 +83,7 @@
%include "gnuradio/filter/dc_blocker_cc.h"
%include "gnuradio/filter/dc_blocker_ff.h"
%include "gnuradio/filter/filter_delay_fc.h"
+%include "gnuradio/filter/filterbank_vcvcf.h"
%include "gnuradio/filter/fir_filter_ccc.h"
%include "gnuradio/filter/fir_filter_ccf.h"
%include "gnuradio/filter/fir_filter_fcc.h"
@@ -128,6 +130,7 @@
GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_cc);
GR_SWIG_BLOCK_MAGIC2(filter, dc_blocker_ff);
GR_SWIG_BLOCK_MAGIC2(filter, filter_delay_fc);
+GR_SWIG_BLOCK_MAGIC2(filter, filterbank_vcvcf);
GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc);
GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf);
GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fcc);
diff --git a/gr-qtgui/grc/qtgui_block_tree.xml b/gr-qtgui/grc/qtgui_block_tree.xml
index 14516df71e..2fc1b0343e 100644
--- a/gr-qtgui/grc/qtgui_block_tree.xml
+++ b/gr-qtgui/grc/qtgui_block_tree.xml
@@ -2,19 +2,19 @@
<!--
Copyright 2012-2013 Free Software Foundation, Inc.
-
+
This file is part of GNU Radio
-
+
GNU Radio is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
-
+
GNU Radio is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with GNU Radio; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street,
@@ -38,6 +38,7 @@
<block>qtgui_waterfall_sink_x</block>
<block>qtgui_time_raster_sink_x</block>
<block>qtgui_histogram_sink_x</block>
+ <block>qtgui_number_sink</block>
<block>qtgui_sink_x</block>
</cat>
</cat>
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml
index c751c89437..08f9064648 100644
--- a/gr-qtgui/grc/qtgui_const_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_const_sink_x.xml
@@ -5,12 +5,12 @@
###################################################
-->
<block>
- <name>QT GUI Constellation Sink</name>
- <key>qtgui_const_sink_x</key>
- <import>from PyQt4 import Qt</import>
- <import>from gnuradio import qtgui</import>
- <import>import sip</import>
- <make>#set $win = 'self._%s_win'%$id
+ <name>QT GUI Constellation Sink</name>
+ <key>qtgui_const_sink_x</key>
+ <import>from PyQt4 import Qt</import>
+ <import>from gnuradio import qtgui</import>
+ <import>import sip</import>
+ <make>#set $win = 'self._%s_win'%$id
qtgui.$(type.fcn)(
$size, \#size
$name, \#name
@@ -19,89 +19,684 @@ qtgui.$(type.fcn)(
self.$(id).set_update_time($update_time)
self.$(id).set_y_axis($ymin, $ymax)
self.$(id).set_x_axis($xmin, $xmax)
+self.$(id).enable_autoscale($autoscale)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+widths = [$width1, $width2, $width3, $width4, $width5,
+ $width6, $width7, $width8, $width9, $width10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+styles = [$style1, $style2, $style3, $style4, $style5,
+ $style6, $style7, $style8, $style9, $style10]
+markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
+ $marker6, $marker7, $marker8, $marker9, $marker10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+ $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+for i in xrange($nconnections):
+ if len(labels[i]) == 0:
+ self.$(id).set_line_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_line_width(i, widths[i])
+ self.$(id).set_line_color(i, colors[i])
+ self.$(id).set_line_style(i, styles[i])
+ self.$(id).set_line_marker(i, markers[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+
self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
$(gui_hint()($win))</make>
- <callback>set_resize($width, $height)</callback>
- <callback>set_update_time($update_time)</callback>
- <callback>set_title($which, $title)</callback>
- <callback>set_color($which, $color)</callback>
- <param>
- <name>Type</name>
- <key>type</key>
- <value>complex</value>
- <type>enum</type>
- <option><name>Complex</name><key>complex</key><opt>fcn:const_sink_c</opt></option>
-<!-- <option><name>Float</name><key>float</key><opt>fcn:const_sink_f</opt></option> -->
- </param>
- <param>
- <name>Name</name>
- <key>name</key>
- <value>QT GUI Plot</value>
- <type>string</type>
- </param>
- <param>
- <name>Number of Points</name>
- <key>size</key>
- <value>1024</value>
- <type>int</type>
- </param>
- <param>
- <name>Y min</name>
- <key>ymin</key>
- <value>-2</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Y max</name>
- <key>ymax</key>
- <value>2</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>X min</name>
- <key>xmin</key>
- <value>-2</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>X max</name>
- <key>xmax</key>
- <value>2</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Number of Inputs</name>
- <key>nconnections</key>
- <value>1</value>
- <type>int</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Update Period</name>
- <key>update_time</key>
- <value>0.10</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>GUI Hint</name>
- <key>gui_hint</key>
- <value></value>
- <type>gui_hint</type>
- <hide>part</hide>
- </param>
- <sink>
- <name>in</name>
- <type>$type</type>
- <nports>$nconnections</nports>
- </sink>
- <doc>
+ <callback>set_resize($width, $height)</callback>
+ <callback>set_update_time($update_time)</callback>
+ <callback>set_title($which, $title)</callback>
+ <callback>set_color($which, $color)</callback>
+
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <value>complex</value>
+ <type>enum</type>
+ <option><name>Complex</name><key>complex</key><opt>fcn:const_sink_c</opt></option>
+<!--<option><name>Float</name><key>float</key><opt>fcn:const_sink_f</opt></option> -->
+ </param>
+ <param>
+ <name>Name</name>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Number of Points</name>
+ <key>size</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+
+ <param>
+ <name>Autoscale</name>
+ <key>autoscale</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
+ <name>Y min</name>
+ <key>ymin</key>
+ <value>-2</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Y max</name>
+ <key>ymax</key>
+ <value>2</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>X min</name>
+ <key>xmin</key>
+ <value>-2</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>X max</name>
+ <key>xmax</key>
+ <value>2</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Number of Inputs</name>
+ <key>nconnections</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Update Period</name>
+ <key>update_time</key>
+ <value>0.10</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>GUI Hint</name>
+ <key>gui_hint</key>
+ <value></value>
+ <type>gui_hint</type>
+ <hide>part</hide>
+ </param>
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Width</name>
+ <key>width1</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Blue</name>
+ <key>"blue"</key>
+ </option>
+ <option>
+ <name>Red</name>
+ <key>"red"</key>
+ </option>
+ <option>
+ <name>Green</name>
+ <key>"green"</key>
+ </option>
+ <option>
+ <name>Black</name>
+ <key>"black"</key>
+ </option>
+ <option>
+ <name>Cyan</name>
+ <key>"cyan"</key>
+ </option>
+ <option>
+ <name>Magenta</name>
+ <key>"magenta"</key>
+ </option>
+ <option>
+ <name>Yellow</name>
+ <key>"yellow"</key>
+ </option>
+ <option>
+ <name>Dark Red</name>
+ <key>"dark red"</key>
+ </option>
+ <option>
+ <name>Dark Green</name>
+ <key>"dark green"</key>
+ </option>
+ <option>
+ <name>Dark Blue</name>
+ <key>"Dark Blue"</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Style</name>
+ <key>style1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>None</name>
+ <key>0</key>
+ </option>
+ <option>
+ <name>Solid</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Dash</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Dots</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>Dash-Dot</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>Dash-Dot-Dot</name>
+ <key>5</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Marker</name>
+ <key>marker1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Circle</name>
+ <key>0</key>
+ </option>
+ <option>
+ <name>Rectangle</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Diamond</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Triangle</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>Down Triangle</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>Left Triangle</name>
+ <key>6</key>
+ </option>
+ <option>
+ <name>Right Triangle</name>
+ <key>7</key>
+ </option>
+ <option>
+ <name>Cross</name>
+ <key>8</key>
+ </option>
+ <option>
+ <name>X-Cross</name>
+ <key>9</key>
+ </option>
+ <option>
+ <name>None</name>
+ <key>-1</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Alpha</name>
+ <key>alpha1</key>
+ <value>1.0</value>
+ <type>float</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 2 Width</name>
+ <key>width2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 2 Style</name>
+ <key>style2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 2 Marker</name>
+ <key>marker2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 2 Alpha</name>
+ <key>alpha2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 3 Width</name>
+ <key>width3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 3 Style</name>
+ <key>style3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 3 Marker</name>
+ <key>marker3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 3 Alpha</name>
+ <key>alpha3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 4 Width</name>
+ <key>width4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 4 Style</name>
+ <key>style4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 4 Marker</name>
+ <key>marker4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 4 Alpha</name>
+ <key>alpha4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 5 Width</name>
+ <key>width5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 5 Style</name>
+ <key>style5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 5 Marker</name>
+ <key>marker5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 5 Alpha</name>
+ <key>alpha5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 6 Width</name>
+ <key>width6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 6 Style</name>
+ <key>style6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 6 Marker</name>
+ <key>marker6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 6 Alpha</name>
+ <key>alpha6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 7 Width</name>
+ <key>width7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 7 Style</name>
+ <key>style7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 7 Marker</name>
+ <key>marker7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 7 Alpha</name>
+ <key>alpha7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 8 Width</name>
+ <key>width8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 8 Style</name>
+ <key>style8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 8 Marker</name>
+ <key>marker8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 8 Alpha</name>
+ <key>alpha8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 9 Width</name>
+ <key>width9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 9 Style</name>
+ <key>style9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 9 Marker</name>
+ <key>marker9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 9 Alpha</name>
+ <key>alpha9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 10 Width</name>
+ <key>width10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 10 Style</name>
+ <key>style10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 10 Marker</name>
+ <key>marker10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 10 Alpha</name>
+ <key>alpha10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+
+
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
The GUI hint can be used to position the widget within the application. \
The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
Both the tab specification and the grid position are optional.
- </doc>
+ </doc>
</block>
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml
index 6a61a05e0f..761943eefc 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml
@@ -5,13 +5,13 @@
###################################################
-->
<block>
- <name>QT GUI Frequency Sink</name>
- <key>qtgui_freq_sink_x</key>
- <import>from PyQt4 import Qt</import>
- <import>from gnuradio import qtgui</import>
- <import>from gnuradio.filter import firdes</import>
- <import>import sip</import>
- <make>#set $win = 'self._%s_win'%$id
+ <name>QT GUI Frequency Sink</name>
+ <key>qtgui_freq_sink_x</key>
+ <import>from PyQt4 import Qt</import>
+ <import>from gnuradio import qtgui</import>
+ <import>from gnuradio.filter import firdes</import>
+ <import>import sip</import>
+ <make>#set $win = 'self._%s_win'%$id
qtgui.$(type.fcn)(
$fftsize, \#size
$wintype, \#wintype
@@ -22,26 +22,53 @@ qtgui.$(type.fcn)(
)
self.$(id).set_update_time($update_time)
self.$(id).set_y_axis($ymin, $ymax)
+self.$(id).enable_autoscale($autoscale)
+self.$(id).set_fft_average($average)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+widths = [$width1, $width2, $width3, $width4, $width5,
+ $width6, $width7, $width8, $width9, $width10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+ $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+for i in xrange($nconnections):
+ if len(labels[i]) == 0:
+ self.$(id).set_line_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_line_width(i, widths[i])
+ self.$(id).set_line_color(i, colors[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+
self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
$(gui_hint()($win))</make>
- <callback>set_frequency_range($fc, $bw)</callback>
- <callback>set_update_time($update_time)</callback>
- <callback>set_title($which, $title)</callback>
- <callback>set_color($which, $color)</callback>
- <param>
- <name>Type</name>
- <key>type</key>
- <value>complex</value>
- <type>enum</type>
- <option><name>Complex</name><key>complex</key><opt>fcn:freq_sink_c</opt></option>
- <option><name>Float</name><key>float</key><opt>fcn:freq_sink_f</opt></option>
- </param>
- <param>
- <name>Name</name>
- <key>name</key>
- <value>QT GUI Plot</value>
- <type>string</type>
- </param>
+ <callback>set_frequency_range($fc, $bw)</callback>
+ <callback>set_update_time($update_time)</callback>
+ <callback>set_title($which, $title)</callback>
+ <callback>set_color($which, $color)</callback>
+
+ <param_tab_order>
+ <tab>General</tab>
+ <tab>Config</tab>
+ </param_tab_order>
+
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <value>complex</value>
+ <type>enum</type>
+ <option><name>Complex</name><key>complex</key><opt>fcn:freq_sink_c</opt></option>
+ <option><name>Float</name><key>float</key><opt>fcn:freq_sink_f</opt></option>
+ </param>
+ <param>
+ <name>Name</name>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ <type>string</type>
+ </param>
+
<param>
<name>FFT Size</name>
<key>fftsize</key>
@@ -52,7 +79,7 @@ $(gui_hint()($win))</make>
<name>Window Type</name>
<key>wintype</key>
<value>firdes.WIN_BLACKMAN_hARRIS</value>
- <type>int</type>
+ <type>enum</type>
<hide>part</hide>
<option>
<name>Blackman-harris</name>
@@ -95,49 +122,437 @@ $(gui_hint()($win))</make>
<value>samp_rate</value>
<type>real</type>
</param>
- <param>
- <name>Y min</name>
- <key>ymin</key>
- <value>-140</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Y max</name>
- <key>ymax</key>
- <value>10</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Number of Inputs</name>
- <key>nconnections</key>
- <value>1</value>
- <type>int</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Update Period</name>
- <key>update_time</key>
- <value>0.10</value>
- <type>real</type>
- <hide>part</hide>
- </param>
- <param>
- <name>GUI Hint</name>
- <key>gui_hint</key>
- <value></value>
- <type>gui_hint</type>
- <hide>part</hide>
- </param>
- <sink>
- <name>in</name>
- <type>$type</type>
- <nports>$nconnections</nports>
- </sink>
- <doc>
+
+ <param>
+ <name>Autoscale</name>
+ <key>autoscale</key>
+ <value>False</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>Average</name>
+ <key>average</key>
+ <value>False</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>None</name>
+ <key>1.0</key>
+ </option>
+ <option>
+ <name>Low</name>
+ <key>0.2</key>
+ </option>
+ <option>
+ <name>Medium</name>
+ <key>0.1</key>
+ </option>
+ <option>
+ <name>High</name>
+ <key>0.05</key>
+ </option>
+ </param>
+
+ <param>
+ <name>Y min</name>
+ <key>ymin</key>
+ <value>-140</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Y max</name>
+ <key>ymax</key>
+ <value>10</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Number of Inputs</name>
+ <key>nconnections</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Update Period</name>
+ <key>update_time</key>
+ <value>0.10</value>
+ <type>real</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>GUI Hint</name>
+ <key>gui_hint</key>
+ <value></value>
+ <type>gui_hint</type>
+ <hide>part</hide>
+ </param>
+
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Width</name>
+ <key>width1</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Blue</name>
+ <key>"blue"</key>
+ </option>
+ <option>
+ <name>Red</name>
+ <key>"red"</key>
+ </option>
+ <option>
+ <name>Green</name>
+ <key>"green"</key>
+ </option>
+ <option>
+ <name>Black</name>
+ <key>"black"</key>
+ </option>
+ <option>
+ <name>Cyan</name>
+ <key>"cyan"</key>
+ </option>
+ <option>
+ <name>Magenta</name>
+ <key>"magenta"</key>
+ </option>
+ <option>
+ <name>Yellow</name>
+ <key>"yellow"</key>
+ </option>
+ <option>
+ <name>Dark Red</name>
+ <key>"dark red"</key>
+ </option>
+ <option>
+ <name>Dark Green</name>
+ <key>"dark green"</key>
+ </option>
+ <option>
+ <name>Dark Blue</name>
+ <key>"dark blue"</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Alpha</name>
+ <key>alpha1</key>
+ <value>1.0</value>
+ <type>float</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 2 Width</name>
+ <key>width2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 2 Alpha</name>
+ <key>alpha2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 3 Width</name>
+ <key>width3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <value>"green"</value>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 3 Alpha</name>
+ <key>alpha3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 4 Width</name>
+ <key>width4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <value>"black"</value>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 4 Alpha</name>
+ <key>alpha4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 5 Width</name>
+ <key>width5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <value>"cyan"</value>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 5 Alpha</name>
+ <key>alpha5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 6 Width</name>
+ <key>width6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <value>"magenta"</value>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 6 Alpha</name>
+ <key>alpha6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 7 Width</name>
+ <key>width7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <value>"yellow"</value>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 7 Alpha</name>
+ <key>alpha7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 8 Width</name>
+ <key>width8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <value>"dark red"</value>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 8 Alpha</name>
+ <key>alpha8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 9 Width</name>
+ <key>width9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <value>"dark green"</value>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 9 Alpha</name>
+ <key>alpha9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 10 Width</name>
+ <key>width10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <value>"dark blue"</value>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 10 Alpha</name>
+ <key>alpha10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
The GUI hint can be used to position the widget within the application. \
The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
Both the tab specification and the grid position are optional.
- </doc>
+ </doc>
</block>
diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
index 8a810abab7..254089181b 100644
--- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
@@ -19,14 +19,48 @@ qtgui.histogram_sink_f(
$name,
$nconnections
)
+
self.$(id).set_update_time($update_time)
+self.$(id).enable_autoscale($autoscale)
+self.$(id).enable_accumulate($accum)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+widths = [$width1, $width2, $width3, $width4, $width5,
+ $width6, $width7, $width8, $width9, $width10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+styles = [$style1, $style2, $style3, $style4, $style5,
+ $style6, $style7, $style8, $style9, $style10]
+markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
+ $marker6, $marker7, $marker8, $marker9, $marker10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+ $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+for i in xrange($nconnections):
+ if len(labels[i]) == 0:
+ self.$(id).set_line_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_line_width(i, widths[i])
+ self.$(id).set_line_color(i, colors[i])
+ self.$(id).set_line_style(i, styles[i])
+ self.$(id).set_line_marker(i, markers[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+
self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
$(gui_hint()($win))</make>
<callback>set_update_time($update_time)</callback>
<callback>set_title($which, $title)</callback>
<callback>set_color($which, $color)</callback>
<callback>set_bins($bins)</callback>
- <callback>set_x_axis($bins)</callback>
+ <callback>set_bins($bins)</callback>
+ <callback>set_x_axis($xmin, $xmax)</callback>
+
+ <param_tab_order>
+ <tab>General</tab>
+ <tab>Config</tab>
+ </param_tab_order>
+
<param>
<name>Name</name>
<key>name</key>
@@ -45,6 +79,37 @@ $(gui_hint()($win))</make>
<value>100</value>
<type>int</type>
</param>
+
+ <param>
+ <name>Autoscale</name>
+ <key>autoscale</key>
+ <value>True</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
+ <name>Accumulate</name>
+ <key>accum</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
<param>
<name>Min x-axis</name>
<key>xmin</key>
@@ -78,14 +143,569 @@ $(gui_hint()($win))</make>
<type>gui_hint</type>
<hide>part</hide>
</param>
- <sink>
- <name>in</name>
- <type>float</type>
- <nports>$nconnections</nports>
- </sink>
- <doc>
+
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Width</name>
+ <key>width1</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Blue</name>
+ <key>"blue"</key>
+ </option>
+ <option>
+ <name>Red</name>
+ <key>"red"</key>
+ </option>
+ <option>
+ <name>Green</name>
+ <key>"green"</key>
+ </option>
+ <option>
+ <name>Black</name>
+ <key>"black"</key>
+ </option>
+ <option>
+ <name>Cyan</name>
+ <key>"cyan"</key>
+ </option>
+ <option>
+ <name>Magenta</name>
+ <key>"magenta"</key>
+ </option>
+ <option>
+ <name>Yellow</name>
+ <key>"yellow"</key>
+ </option>
+ <option>
+ <name>Dark Red</name>
+ <key>"dark red"</key>
+ </option>
+ <option>
+ <name>Dark Green</name>
+ <key>"dark green"</key>
+ </option>
+ <option>
+ <name>Dark Blue</name>
+ <key>"dark blue"</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Style</name>
+ <key>style1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Solid</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Dash</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Dots</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>Dash-Dot</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>Dash-Dot-Dot</name>
+ <key>5</key>
+ </option>
+ <option>
+ <name>None</name>
+ <key>0</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Marker</name>
+ <key>marker1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>None</name>
+ <key>-1</key>
+ </option>
+ <option>
+ <name>Circle</name>
+ <key>0</key>
+ </option>
+ <option>
+ <name>Rectangle</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Diamond</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Triangle</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>Down Triangle</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>Left Triangle</name>
+ <key>6</key>
+ </option>
+ <option>
+ <name>Right Triangle</name>
+ <key>7</key>
+ </option>
+ <option>
+ <name>Cross</name>
+ <key>8</key>
+ </option>
+ <option>
+ <name>X-Cross</name>
+ <key>9</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Alpha</name>
+ <key>alpha1</key>
+ <value>1.0</value>
+ <type>float</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 2 Width</name>
+ <key>width2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <value>"red"</value>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 2 Style</name>
+ <key>style2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 2 Marker</name>
+ <key>marker2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 2 Alpha</name>
+ <key>alpha2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 3 Width</name>
+ <key>width3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <value>"green"</value>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 3 Style</name>
+ <key>style3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 3 Marker</name>
+ <key>marker3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 3 Alpha</name>
+ <key>alpha3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 4 Width</name>
+ <key>width4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <value>"black"</value>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 4 Style</name>
+ <key>style4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 4 Marker</name>
+ <key>marker4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 4 Alpha</name>
+ <key>alpha4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 5 Width</name>
+ <key>width5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <value>"cyan"</value>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 5 Style</name>
+ <key>style5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 5 Marker</name>
+ <key>marker5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 5 Alpha</name>
+ <key>alpha5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 6 Width</name>
+ <key>width6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <value>"magenta"</value>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 6 Style</name>
+ <key>style6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 6 Marker</name>
+ <key>marker6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 6 Alpha</name>
+ <key>alpha6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 7 Width</name>
+ <key>width7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <value>"yellow"</value>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 7 Style</name>
+ <key>style7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 7 Marker</name>
+ <key>marker7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 7 Alpha</name>
+ <key>alpha7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 8 Width</name>
+ <key>width8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <value>"dark red"</value>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 8 Style</name>
+ <key>style8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 8 Marker</name>
+ <key>marker8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 8 Alpha</name>
+ <key>alpha8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 9 Width</name>
+ <key>width9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <value>"dark green"</value>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 9 Style</name>
+ <key>style9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 9 Marker</name>
+ <key>marker9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 9 Alpha</name>
+ <key>alpha9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 10 Width</name>
+ <key>width10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <value>"dark blue"</value>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 10 Style</name>
+ <key>style10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 10 Marker</name>
+ <key>marker10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 10 Alpha</name>
+ <key>alpha10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+
+
+
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
The GUI hint can be used to position the widget within the application. \
The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
Both the tab specification and the grid position are optional.
- </doc>
+ </doc>
</block>
diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml
new file mode 100644
index 0000000000..af74bca0bf
--- /dev/null
+++ b/gr-qtgui/grc/qtgui_number_sink.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##QT GUI Number Sink
+###################################################
+ -->
+<block>
+ <name>QT GUI Number Sink</name>
+ <key>qtgui_number_sink</key>
+ <import>from PyQt4 import Qt</import>
+ <import>from gnuradio import qtgui</import>
+ <import>import sip</import>
+ <make>#set $win = 'self._%s_win'%$id
+qtgui.number_sink(
+ $type.size,
+ $avg,
+ $graph_type,
+ $nconnections
+)
+self.$(id).set_update_time($update_time)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+for i in xrange($nconnections):
+ self.$(id).set_min(i, $min)
+ self.$(id).set_max(i, $max)
+ self.$(id).set_color(i, colors[i][0], colors[i][1])
+ if len(labels[i]) == 0:
+ self.$(id).set_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_label(i, labels[i])
+
+self.$(id).enable_autoscale($autoscale)
+self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
+$(gui_hint()($win))</make>
+ <callback>set_update_time($update_time)</callback>
+
+ <param_tab_order>
+ <tab>General</tab>
+ <tab>Config</tab>
+ </param_tab_order>
+
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ <tab>General</tab>
+ </param>
+
+ <param>
+ <name>Autoscale</name>
+ <key>autoscale</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
+ <name>Average</name>
+ <key>avg</key>
+ <value>0</value>
+ <type>float</type>
+ <tab>General</tab>
+ </param>
+
+ <param>
+ <name>Graph Type</name>
+ <key>graph_type</key>
+ <type>enum</type>
+ <option>
+ <name>Horizontal</name>
+ <key>qtgui.NUM_GRAPH_HORIZ</key>
+ </option>
+ <option>
+ <name>Verticle</name>
+ <key>qtgui.NUM_GRAPH_VERT</key>
+ </option>
+ <option>
+ <name>None</name>
+ <key>qtgui.NUM_GRAPH_NONE</key>
+ </option>
+ <tab>General</tab>
+ </param>
+
+ <param>
+ <name>Number of Inputs</name>
+ <key>nconnections</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>part</hide>
+ <tab>General</tab>
+ </param>
+
+ <param>
+ <name>Min</name>
+ <key>min</key>
+ <value>-1</value>
+ <type>float</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>max</name>
+ <key>max</key>
+ <value>1</value>
+ <type>float</type>
+ <hide>part</hide>
+ </param>
+
+ <param>
+ <name>Update Period</name>
+ <key>update_time</key>
+ <value>0.10</value>
+ <type>float</type>
+ <hide>part</hide>
+ <tab>General</tab>
+ </param>
+
+ <param>
+ <name>GUI Hint</name>
+ <key>gui_hint</key>
+ <value></value>
+ <type>gui_hint</type>
+ <hide>part</hide>
+ <tab>General</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Black</name>
+ <key>("black", "black")</key>
+ </option>
+ <option>
+ <name>Blue-Red</name>
+ <key>("blue", "red")</key>
+ </option>
+ <option>
+ <name>White Hot</name>
+ <key>("black", "white")</key>
+ </option>
+ <option>
+ <name>Black Hot</name>
+ <key>("white", "black")</key>
+ </option>
+ <option>
+ <name>Black-Red</name>
+ <key>("black", "red")</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
+ The GUI hint can be used to position the widget within the application. \
+ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
+ Both the tab specification and the grid position are optional.
+ </doc>
+</block>
diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml b/gr-qtgui/grc/qtgui_time_raster_x.xml
index 7d880ab084..db13ce5f6a 100644
--- a/gr-qtgui/grc/qtgui_time_raster_x.xml
+++ b/gr-qtgui/grc/qtgui_time_raster_x.xml
@@ -20,7 +20,23 @@ qtgui.$(type.fcn)(
$name,
$nconnections,
)
+
self.$(id).set_update_time($update_time)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+ $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+for i in xrange($nconnections):
+ if len(labels[i]) == 0:
+ self.$(id).set_line_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_color_map(i, colors[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+
self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
$(gui_hint()($win))</make>
<callback>set_num_rows($nrows)</callback>
@@ -30,6 +46,12 @@ $(gui_hint()($win))</make>
<callback>set_update_time($update_time)</callback>
<callback>set_title($which, $title)</callback>
<callback>set_color($which, $color)</callback>
+
+ <param_tab_order>
+ <tab>General</tab>
+ <tab>Config</tab>
+ </param_tab_order>
+
<param>
<name>Type</name>
<key>type</key>
@@ -95,14 +117,256 @@ $(gui_hint()($win))</make>
<type>gui_hint</type>
<hide>part</hide>
</param>
- <sink>
- <name>in</name>
- <type>$type</type>
- <nports>$nconnections</nports>
- </sink>
- <doc>
+
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Multi Color</name>
+ <key>0</key>
+ </option>
+ <option>
+ <name>White Hot</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Black Hot</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Incandescent</name>
+ <key>3</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Alpha</name>
+ <key>alpha1</key>
+ <value>1.0</value>
+ <type>float</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 2 Alpha</name>
+ <key>alpha2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 3 Alpha</name>
+ <key>alpha3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 4 Alpha</name>
+ <key>alpha4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 5 Alpha</name>
+ <key>alpha5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 6 Alpha</name>
+ <key>alpha6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 7 Alpha</name>
+ <key>alpha7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 8 Alpha</name>
+ <key>alpha8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 9 Alpha</name>
+ <key>alpha9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 10 Alpha</name>
+ <key>alpha10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
The GUI hint can be used to position the widget within the application. \
The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
Both the tab specification and the grid position are optional.
- </doc>
+ </doc>
</block>
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 3da87a9d29..172da7a02d 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -5,13 +5,13 @@
###################################################
-->
<block>
- <name>QT GUI Time Sink</name>
- <key>qtgui_time_sink_x</key>
- <import>from PyQt4 import Qt</import>
- <import>from gnuradio import qtgui</import>
- <import>from gnuradio.filter import firdes</import>
- <import>import sip</import>
- <make>#set $win = 'self._%s_win'%$id
+ <name>QT GUI Time Sink</name>
+ <key>qtgui_time_sink_x</key>
+ <import>from PyQt4 import Qt</import>
+ <import>from gnuradio import qtgui</import>
+ <import>from gnuradio.filter import firdes</import>
+ <import>import sip</import>
+ <make>#set $win = 'self._%s_win'%$id
qtgui.$(type.fcn)(
$size, \#size
$srate, \#samp_rate
@@ -22,174 +22,799 @@ self.$(id).set_update_time($update_time)
self.$(id).set_y_axis($ymin, $ymax)
self.$(id).enable_tags(-1, $entags)
self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_delay, $tr_chan, $tr_tag)
+self.$(id).enable_autoscale($autoscale)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+widths = [$width1, $width2, $width3, $width4, $width5,
+ $width6, $width7, $width8, $width9, $width10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+styles = [$style1, $style2, $style3, $style4, $style5,
+ $style6, $style7, $style8, $style9, $style10]
+markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
+ $marker6, $marker7, $marker8, $marker9, $marker10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+ $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+
+#if($type() == "complex")
+for i in xrange(2*$nconnections):
+ if len(labels[i]) == 0:
+ if(i % 2 == 0):
+ self.$(id).set_line_label(i, "Re{{Data {0}}}".format(i/2))
+ else:
+ self.$(id).set_line_label(i, "Im{{Data {0}}}".format(i/2))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_line_width(i, widths[i])
+ self.$(id).set_line_color(i, colors[i])
+ self.$(id).set_line_style(i, styles[i])
+ self.$(id).set_line_marker(i, markers[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+#else
+for i in xrange($nconnections):
+ if len(labels[i]) == 0:
+ self.$(id).set_line_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_line_width(i, widths[i])
+ self.$(id).set_line_color(i, colors[i])
+ self.$(id).set_line_style(i, styles[i])
+ self.$(id).set_line_marker(i, markers[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+#end if
+
self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
$(gui_hint()($win))</make>
- <callback>set_time_domain_axis($min, $max)</callback>
- <callback>set_update_time($update_time)</callback>
- <callback>set_title($which, $title)</callback>
- <callback>set_color($which, $color)</callback>
- <callback>set_y_axis($ymin, $ymax)</callback>
- <callback>set_samp_rate($srate)</callback>
- <param>
- <name>Type</name>
- <key>type</key>
- <value>complex</value>
- <type>enum</type>
- <option><name>Complex</name><key>complex</key><opt>fcn:time_sink_c</opt></option>
- <option><name>Float</name><key>float</key><opt>fcn:time_sink_f</opt></option>
- </param>
- <param>
- <name>Name</name>
- <key>name</key>
- <value>QT GUI Plot</value>
- <type>string</type>
- </param>
- <param>
- <name>Number of Points</name>
- <key>size</key>
- <value>1024</value>
- <type>int</type>
- </param>
- <param>
- <name>Sample Rate</name>
- <key>srate</key>
- <value>samp_rate</value>
- <type>float</type>
- </param>
- <param>
- <name>Y min</name>
- <key>ymin</key>
- <value>-1</value>
- <type>float</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Y max</name>
- <key>ymax</key>
- <value>1</value>
- <type>float</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Number of Inputs</name>
- <key>nconnections</key>
- <value>1</value>
- <type>int</type>
- <hide>part</hide>
- </param>
- <param>
- <name>Update Period</name>
- <key>update_time</key>
- <value>0.10</value>
- <type>float</type>
- <hide>part</hide>
- </param>
-
- <param>
- <name>Trigger Mode</name>
- <key>tr_mode</key>
- <value>qtgui.TRIG_MODE_FREE</value>
- <type>enum</type>
- <hide>part</hide>
- <option>
- <name>Free</name>
- <key>qtgui.TRIG_MODE_FREE</key>
- </option>
- <option>
- <name>Auto</name>
- <key>qtgui.TRIG_MODE_AUTO</key>
- </option>
- <option>
- <name>Normal</name>
- <key>qtgui.TRIG_MODE_NORM</key>
- </option>
- <option>
- <name>Tag</name>
- <key>qtgui.TRIG_MODE_TAG</key>
- </option>
- </param>
-
- <param>
- <name>Trigger Slope</name>
- <key>tr_slope</key>
- <value>qtgui.TRIG_MODE_POS</value>
- <type>enum</type>
- <hide>part</hide>
- <option>
- <name>Positive</name>
- <key>qtgui.TRIG_SLOPE_POS</key>
- </option>
- <option>
- <name>Negative</name>
- <key>qtgui.TRIG_SLOPE_NEG</key>
- </option>
- </param>
-
- <param>
- <name>Trigger Level</name>
- <key>tr_level</key>
- <value>0.0</value>
- <type>float</type>
- <hide>part</hide>
- </param>
-
- <param>
- <name>Trigger Delay</name>
- <key>tr_delay</key>
- <value>0</value>
- <type>float</type>
- <hide>part</hide>
- </param>
-
- <param>
- <name>Trigger Channel</name>
- <key>tr_chan</key>
- <value>0</value>
- <type>int</type>
- <hide>part</hide>
- </param>
-
- <param>
- <name>Trigger Tag Key</name>
- <key>tr_tag</key>
- <value>""</value>
- <type>string</type>
- <hide>part</hide>
- </param>
-
- <param>
- <name>Disp. Tags</name>
- <key>entags</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>GUI Hint</name>
- <key>gui_hint</key>
- <value></value>
- <type>gui_hint</type>
- <hide>part</hide>
- </param>
-
- <check>$tr_chan &lt; 2*$nconnections</check>
-
- <sink>
- <name>in</name>
- <type>$type</type>
- <nports>$nconnections</nports>
- </sink>
- <doc>
+ <callback>set_time_domain_axis($min, $max)</callback>
+ <callback>set_update_time($update_time)</callback>
+ <callback>set_title($which, $title)</callback>
+ <callback>set_color($which, $color)</callback>
+ <callback>set_y_axis($ymin, $ymax)</callback>
+ <callback>set_samp_rate($srate)</callback>
+
+ <param_tab_order>
+ <tab>General</tab>
+ <tab>Trigger</tab>
+ <tab>Config</tab>
+ </param_tab_order>
+
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <value>complex</value>
+ <type>enum</type>
+ <option><name>Complex</name><key>complex</key><opt>fcn:time_sink_c</opt></option>
+ <option><name>Float</name><key>float</key><opt>fcn:time_sink_f</opt></option>
+ </param>
+ <param>
+ <name>Name</name>
+ <key>name</key>
+ <value>QT GUI Plot</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Number of Points</name>
+ <key>size</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Sample Rate</name>
+ <key>srate</key>
+ <value>samp_rate</value>
+ <type>float</type>
+ </param>
+
+ <param>
+ <name>Autoscale</name>
+ <key>autoscale</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+
+ <param>
+ <name>Y min</name>
+ <key>ymin</key>
+ <value>-1</value>
+ <type>float</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Y max</name>
+ <key>ymax</key>
+ <value>1</value>
+ <type>float</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Number of Inputs</name>
+ <key>nconnections</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Update Period</name>
+ <key>update_time</key>
+ <value>0.10</value>
+ <type>float</type>
+ <hide>part</hide>
+ </param>
+ <param>
+ <name>Disp. Tags</name>
+ <key>entags</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>GUI Hint</name>
+ <key>gui_hint</key>
+ <value></value>
+ <type>gui_hint</type>
+ <hide>part</hide>
+ </param>
+
+
+ <param>
+ <name>Trigger Mode</name>
+ <key>tr_mode</key>
+ <value>qtgui.TRIG_MODE_FREE</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Free</name>
+ <key>qtgui.TRIG_MODE_FREE</key>
+ </option>
+ <option>
+ <name>Auto</name>
+ <key>qtgui.TRIG_MODE_AUTO</key>
+ </option>
+ <option>
+ <name>Normal</name>
+ <key>qtgui.TRIG_MODE_NORM</key>
+ </option>
+ <option>
+ <name>Tag</name>
+ <key>qtgui.TRIG_MODE_TAG</key>
+ </option>
+ <tab>Trigger</tab>
+ </param>
+
+ <param>
+ <name>Trigger Slope</name>
+ <key>tr_slope</key>
+ <value>qtgui.TRIG_MODE_POS</value>
+ <type>enum</type>
+ <hide>part</hide>
+ <option>
+ <name>Positive</name>
+ <key>qtgui.TRIG_SLOPE_POS</key>
+ </option>
+ <option>
+ <name>Negative</name>
+ <key>qtgui.TRIG_SLOPE_NEG</key>
+ </option>
+ <tab>Trigger</tab>
+ </param>
+
+ <param>
+ <name>Trigger Level</name>
+ <key>tr_level</key>
+ <value>0.0</value>
+ <type>float</type>
+ <hide>part</hide>
+ <tab>Trigger</tab>
+ </param>
+
+ <param>
+ <name>Trigger Delay</name>
+ <key>tr_delay</key>
+ <value>0</value>
+ <type>float</type>
+ <hide>part</hide>
+ <tab>Trigger</tab>
+ </param>
+
+ <param>
+ <name>Trigger Channel</name>
+ <key>tr_chan</key>
+ <value>0</value>
+ <type>int</type>
+ <hide>part</hide>
+ <tab>Trigger</tab>
+ </param>
+
+ <param>
+ <name>Trigger Tag Key</name>
+ <key>tr_tag</key>
+ <value>""</value>
+ <type>string</type>
+ <hide>part</hide>
+ <tab>Trigger</tab>
+ </param>
+
+
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Width</name>
+ <key>width1</key>
+ <value>1</value>
+ <type>int</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Blue</name>
+ <key>"blue"</key>
+ </option>
+ <option>
+ <name>Red</name>
+ <key>"red"</key>
+ </option>
+ <option>
+ <name>Green</name>
+ <key>"green"</key>
+ </option>
+ <option>
+ <name>Black</name>
+ <key>"black"</key>
+ </option>
+ <option>
+ <name>Cyan</name>
+ <key>"cyan"</key>
+ </option>
+ <option>
+ <name>Magenta</name>
+ <key>"magenta"</key>
+ </option>
+ <option>
+ <name>Yellow</name>
+ <key>"yellow"</key>
+ </option>
+ <option>
+ <name>Dark Red</name>
+ <key>"dark red"</key>
+ </option>
+ <option>
+ <name>Dark Green</name>
+ <key>"dark green"</key>
+ </option>
+ <option>
+ <name>Dark Blue</name>
+ <key>"Dark Blue"</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Style</name>
+ <key>style1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Solid</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Dash</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Dots</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>Dash-Dot</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>Dash-Dot-Dot</name>
+ <key>5</key>
+ </option>
+ <option>
+ <name>None</name>
+ <key>0</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Marker</name>
+ <key>marker1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>None</name>
+ <key>-1</key>
+ </option>
+ <option>
+ <name>Circle</name>
+ <key>0</key>
+ </option>
+ <option>
+ <name>Rectangle</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Diamond</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Triangle</name>
+ <key>3</key>
+ </option>
+ <option>
+ <name>Down Triangle</name>
+ <key>4</key>
+ </option>
+ <option>
+ <name>Left Triangle</name>
+ <key>6</key>
+ </option>
+ <option>
+ <name>Right Triangle</name>
+ <key>7</key>
+ </option>
+ <option>
+ <name>Cross</name>
+ <key>8</key>
+ </option>
+ <option>
+ <name>X-Cross</name>
+ <key>9</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Alpha</name>
+ <key>alpha1</key>
+ <value>1.0</value>
+ <type>float</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 2 Width</name>
+ <key>width2</key>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <value>"red"</value>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 2 Style</name>
+ <key>style2</key>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 2 Marker</name>
+ <key>marker2</key>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 2 Alpha</name>
+ <key>alpha2</key>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 3 Width</name>
+ <key>width3</key>
+ <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <value>"green"</value>
+ <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 3 Style</name>
+ <key>style3</key>
+ <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 3 Marker</name>
+ <key>marker3</key>
+ <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 3 Alpha</name>
+ <key>alpha3</key>
+ <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 4 Width</name>
+ <key>width4</key>
+ <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <value>"black"</value>
+ <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 4 Style</name>
+ <key>style4</key>
+ <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 4 Marker</name>
+ <key>marker4</key>
+ <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 4 Alpha</name>
+ <key>alpha4</key>
+ <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 5 Width</name>
+ <key>width5</key>
+ <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <value>"cyan"</value>
+ <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 5 Style</name>
+ <key>style5</key>
+ <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 5 Marker</name>
+ <key>marker5</key>
+ <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 5 Alpha</name>
+ <key>alpha5</key>
+ <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 6 Width</name>
+ <key>width6</key>
+ <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <value>"magenta"</value>
+ <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 6 Style</name>
+ <key>style6</key>
+ <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 6 Marker</name>
+ <key>marker6</key>
+ <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 6 Alpha</name>
+ <key>alpha6</key>
+ <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 7 Width</name>
+ <key>width7</key>
+ <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <value>"yellow"</value>
+ <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 7 Style</name>
+ <key>style7</key>
+ <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 7 Marker</name>
+ <key>marker7</key>
+ <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 7 Alpha</name>
+ <key>alpha7</key>
+ <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 8 Width</name>
+ <key>width8</key>
+ <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <value>"dark red"</value>
+ <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 8 Style</name>
+ <key>style8</key>
+ <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 8 Marker</name>
+ <key>marker8</key>
+ <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 8 Alpha</name>
+ <key>alpha8</key>
+ <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 9 Width</name>
+ <key>width9</key>
+ <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <value>"dark green"</value>
+ <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 9 Style</name>
+ <key>style9</key>
+ <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 9 Marker</name>
+ <key>marker9</key>
+ <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 9 Alpha</name>
+ <key>alpha9</key>
+ <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>width1</base_key>
+ <name>Line 10 Width</name>
+ <key>width10</key>
+ <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <value>"dark blue"</value>
+ <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>style1</base_key>
+ <name>Line 10 Style</name>
+ <key>style10</key>
+ <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>marker1</base_key>
+ <name>Line 10 Marker</name>
+ <key>marker10</key>
+ <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 10 Alpha</name>
+ <key>alpha10</key>
+ <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+ </param>
+
+
+ <check>$tr_chan &lt; 2*$nconnections</check>
+
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
The GUI hint can be used to position the widget within the application. \
The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
Both the tab specification and the grid position are optional.
- </doc>
+ </doc>
</block>
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
index ac08450730..943aa9d962 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
@@ -5,13 +5,13 @@
###################################################
-->
<block>
- <name>QT GUI Waterfall Sink</name>
- <key>qtgui_waterfall_sink_x</key>
- <import>from PyQt4 import Qt</import>
- <import>from gnuradio import qtgui</import>
- <import>from gnuradio.filter import firdes</import>
- <import>import sip</import>
- <make>#set $win = 'self._%s_win'%$id
+ <name>QT GUI Waterfall Sink</name>
+ <key>qtgui_waterfall_sink_x</key>
+ <import>from PyQt4 import Qt</import>
+ <import>from gnuradio import qtgui</import>
+ <import>from gnuradio.filter import firdes</import>
+ <import>import sip</import>
+ <make>#set $win = 'self._%s_win'%$id
qtgui.$(type.fcn)(
$fftsize, \#size
$wintype, \#wintype
@@ -21,12 +21,33 @@ qtgui.$(type.fcn)(
$nconnections \#number of inputs
)
self.$(id).set_update_time($update_time)
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+ $label6, $label7, $label8, $label9, $label10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+ $color6, $color7, $color8, $color9, $color10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+ $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+for i in xrange($nconnections):
+ if len(labels[i]) == 0:
+ self.$(id).set_line_label(i, "Data {0}".format(i))
+ else:
+ self.$(id).set_line_label(i, labels[i])
+ self.$(id).set_color_map(i, colors[i])
+ self.$(id).set_line_alpha(i, alphas[i])
+
self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
$(gui_hint()($win))</make>
- <callback>set_frequency_range($fc, $bw)</callback>
- <callback>set_update_time($update_time)</callback>
- <callback>set_title($which, $title)</callback>
- <callback>set_color($which, $color)</callback>
+ <callback>set_frequency_range($fc, $bw)</callback>
+ <callback>set_update_time($update_time)</callback>
+ <callback>set_title($which, $title)</callback>
+ <callback>set_color($which, $color)</callback>
+
+ <param_tab_order>
+ <tab>General</tab>
+ <tab>Config</tab>
+ </param_tab_order>
+
<param>
<name>Type</name>
<key>type</key>
@@ -115,14 +136,257 @@ $(gui_hint()($win))</make>
<type>gui_hint</type>
<hide>part</hide>
</param>
- <sink>
- <name>in</name>
- <type>$type</type>
- <nports>$nconnections</nports>
- </sink>
- <doc>
+
+
+
+ <param>
+ <name>Line 1 Label</name>
+ <key>label1</key>
+ <type>string</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Color</name>
+ <key>color1</key>
+ <type>enum</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <option>
+ <name>Multi Color</name>
+ <key>0</key>
+ </option>
+ <option>
+ <name>White Hot</name>
+ <key>1</key>
+ </option>
+ <option>
+ <name>Black Hot</name>
+ <key>2</key>
+ </option>
+ <option>
+ <name>Incandescent</name>
+ <key>3</key>
+ </option>
+ <tab>Config</tab>
+ </param>
+
+ <param>
+ <name>Line 1 Alpha</name>
+ <key>alpha1</key>
+ <value>1.0</value>
+ <type>float</type>
+ <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide>
+ <tab>Config</tab>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 2 Label</name>
+ <key>label2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 2 Color</name>
+ <key>color2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 2 Alpha</name>
+ <key>alpha2</key>
+ <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 3 Label</name>
+ <key>label3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 3 Color</name>
+ <key>color3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 3 Alpha</name>
+ <key>alpha3</key>
+ <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 4 Label</name>
+ <key>label4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 4 Color</name>
+ <key>color4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 4 Alpha</name>
+ <key>alpha4</key>
+ <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 5 Label</name>
+ <key>label5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 5 Color</name>
+ <key>color5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 5 Alpha</name>
+ <key>alpha5</key>
+ <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 6 Label</name>
+ <key>label6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 6 Color</name>
+ <key>color6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 6 Alpha</name>
+ <key>alpha6</key>
+ <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 7 Label</name>
+ <key>label7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 7 Color</name>
+ <key>color7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 7 Alpha</name>
+ <key>alpha7</key>
+ <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 8 Label</name>
+ <key>label8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 8 Color</name>
+ <key>color8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 8 Alpha</name>
+ <key>alpha8</key>
+ <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 9 Label</name>
+ <key>label9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 9 Color</name>
+ <key>color9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 9 Alpha</name>
+ <key>alpha9</key>
+ <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <param>
+ <base_key>label1</base_key>
+ <name>Line 10 Label</name>
+ <key>label10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>color1</base_key>
+ <name>Line 10 Color</name>
+ <key>color10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+ <param>
+ <base_key>alpha1</base_key>
+ <name>Line 10 Alpha</name>
+ <key>alpha10</key>
+ <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+ </param>
+
+
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$nconnections</nports>
+ </sink>
+ <doc>
The GUI hint can be used to position the widget within the application. \
The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
Both the tab specification and the grid position are optional.
- </doc>
+ </doc>
</block>
diff --git a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
index 3c6309d9c3..bb0d3cf953 100644
--- a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
+++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
@@ -36,6 +36,9 @@ install(FILES
histogram_sink_f.h
histogramdisplayform.h
HistogramDisplayPlot.h
+ number_sink.h
+ numberdisplayform.h
+ NumberDisplayPlot.h
plot_raster.h
plot_waterfall.h
qtgui_types.h
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
index 517f69f603..73c744063b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -50,7 +50,8 @@ Q_DECLARE_METATYPE ( QColorList )
* \brief QWidget base plot to build QTGUI plotting tools.
* \ingroup qtgui_blk
*/
-class DisplayPlot:public QwtPlot{
+class DisplayPlot:public QwtPlot
+{
Q_OBJECT
Q_PROPERTY ( QColor line_color1 READ getLineColor1 WRITE setLineColor1 )
diff --git a/gr-qtgui/include/gnuradio/qtgui/NumberDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/NumberDisplayPlot.h
new file mode 100644
index 0000000000..307d806b87
--- /dev/null
+++ b/gr-qtgui/include/gnuradio/qtgui/NumberDisplayPlot.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef NUMBER_DISPLAY_PLOT_H
+#define NUMBER_DISPLAY_PLOT_H
+
+#include <stdint.h>
+#include <cstdio>
+#include <vector>
+#include <gnuradio/qtgui/DisplayPlot.h>
+#include <gnuradio/tags.h>
+#include <qwt_plot.h>
+
+/*!
+ * \brief QWidget for displaying number plots.
+ * \ingroup qtgui_blk
+ */
+class NumberDisplayPlot: public DisplayPlot
+{
+ Q_OBJECT
+
+public:
+ NumberDisplayPlot(int nplots, QWidget*);
+ virtual ~NumberDisplayPlot();
+
+ void plotNewData(const std::vector<double> samples);
+
+ void replot();
+
+public slots:
+
+private:
+};
+
+#endif /* NUMBER_DISPLAY_PLOT_H */
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
index 6b305f6e0d..f413ce9b54 100644
--- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h
@@ -64,9 +64,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_y_axis(double min, double max) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
index e7ebc3a797..1b26d289e6 100644
--- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h
+++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
@@ -81,7 +81,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -160,7 +160,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -229,7 +229,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -312,7 +312,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -384,7 +384,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -441,7 +441,7 @@ public:
~LineTitleAction()
{}
-
+
signals:
void whichTrigger(int which, const QString &text);
@@ -453,7 +453,7 @@ public slots:
private slots:
void getText()
- {
+ {
emit whichTrigger(d_which, d_text->text());
d_diag->accept();
}
@@ -521,7 +521,7 @@ public slots:
private slots:
void getText()
- {
+ {
emit whichTrigger(d_text->text());
d_diag->accept();
}
@@ -548,7 +548,7 @@ public:
d_text0 = new QLineEdit();
d_text1 = new QLineEdit();
-
+
QLabel *_label0 = new QLabel(label0);
QLabel *_label1 = new QLabel(label1);
@@ -584,7 +584,7 @@ public slots:
private slots:
void getText()
- {
+ {
emit whichTrigger(d_text0->text(), d_text1->text());
d_diag->accept();
}
@@ -699,7 +699,7 @@ public slots:
//void get13() { emit whichTrigger(8192); }
//void get14() { emit whichTrigger(16384); }
//void get15() { emit whichTrigger(32768); }
- void getOther(const QString &str)
+ void getOther(const QString &str)
{
int value = str.toInt();
emit whichTrigger(value);
@@ -741,7 +741,7 @@ public:
}
d_act[0]->setChecked(true);
- QDoubleValidator *valid = new QDoubleValidator(0.0, 1.0, 2, this);
+ QDoubleValidator *valid = new QDoubleValidator(0.0, 1.0, 3, this);
((OtherAction*)d_act[d_act.size()-1])->setValidator(valid);
connect(d_act[0], SIGNAL(triggered()), this, SLOT(getOff()));
@@ -792,6 +792,21 @@ public:
return d_act[static_cast<int>(which)];
}
+ void setHigh(float x)
+ {
+ d_high = x;
+ }
+
+ void setMedium(float x)
+ {
+ d_medium = x;
+ }
+
+ void setLow(float x)
+ {
+ d_low = x;
+ }
+
signals:
void whichTrigger(float alpha);
@@ -800,7 +815,7 @@ public:
void getHigh() { emit whichTrigger(d_high); }
void getMedium() { emit whichTrigger(d_medium); }
void getLow() { emit whichTrigger(d_low); }
- void getOther(const QString &str)
+ void getOther(const QString &str)
{
float value = str.toFloat();
emit whichTrigger(value);
@@ -863,7 +878,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -958,7 +973,7 @@ public slots:
private slots:
void getText()
- {
+ {
emit whichTrigger(d_text->text().toInt());
d_diag->accept();
}
@@ -1088,7 +1103,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -1166,7 +1181,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -1231,7 +1246,7 @@ public:
{
return d_act.size();
}
-
+
QAction * getAction(int which)
{
if(which < d_act.size())
@@ -1261,6 +1276,162 @@ private:
/********************************************************************/
+class NumberLayoutMenu: public QMenu
+{
+ Q_OBJECT
+
+public:
+ NumberLayoutMenu(QWidget *parent)
+ : QMenu("Layout", parent)
+ {
+ d_grp = new QActionGroup(this);
+ d_act.push_back(new QAction("Horizontal", this));
+ d_act.push_back(new QAction("Vertical", this));
+ d_act.push_back(new QAction("None", this));
+
+ connect(d_act[0], SIGNAL(triggered()), this, SLOT(getHoriz()));
+ connect(d_act[1], SIGNAL(triggered()), this, SLOT(getVert()));
+ connect(d_act[2], SIGNAL(triggered()), this, SLOT(getNone()));
+
+ QListIterator<QAction*> i(d_act);
+ while(i.hasNext()) {
+ QAction *a = i.next();
+ a->setCheckable(true);
+ a->setActionGroup(d_grp);
+ addAction(a);
+ }
+ }
+
+ ~NumberLayoutMenu()
+ {}
+
+ int getNumActions() const
+ {
+ return d_act.size();
+ }
+
+ QAction * getAction(int which)
+ {
+ if(which < d_act.size())
+ return d_act[which];
+ else
+ throw std::runtime_error("NumberLayoutMenu::getAction: which out of range.\n");
+ }
+
+ QAction * getAction(gr::qtgui::graph_t layout)
+ {
+ switch(layout) {
+ case gr::qtgui::NUM_GRAPH_HORIZ:
+ return d_act[0];
+ break;
+ case gr::qtgui::NUM_GRAPH_VERT:
+ return d_act[1];
+ break;
+ case gr::qtgui::NUM_GRAPH_NONE:
+ return d_act[1];
+ break;
+ default:
+ throw std::runtime_error("NumberLayoutMenu::getAction: unknown layout type.\n");
+ }
+ }
+
+signals:
+ void whichTrigger(gr::qtgui::graph_t layout);
+
+public slots:
+ void getHoriz() { emit whichTrigger(gr::qtgui::NUM_GRAPH_HORIZ); }
+ void getVert() { emit whichTrigger(gr::qtgui::NUM_GRAPH_VERT); }
+ void getNone() { emit whichTrigger(gr::qtgui::NUM_GRAPH_NONE); }
+
+private:
+ QList<QAction *> d_act;
+ QActionGroup *d_grp;
+};
+
+
+/********************************************************************/
+
+
+class NumberColorMapMenu: public QMenu
+{
+ Q_OBJECT
+
+public:
+ NumberColorMapMenu(int which, QWidget *parent)
+ : QMenu("Color Map", parent), d_which(which)
+ {
+ d_act.push_back(new QAction("Black", this));
+ d_act.push_back(new QAction("Blue-Red", this));
+ d_act.push_back(new QAction("White Hot", this));
+ d_act.push_back(new QAction("Black Hot", this));
+ d_act.push_back(new QAction("Black-Red", this));
+ d_act.push_back(new QAction("Other", this));
+
+ connect(d_act[0], SIGNAL(triggered()), this, SLOT(getBlack()));
+ connect(d_act[1], SIGNAL(triggered()), this, SLOT(getBlueRed()));
+ connect(d_act[2], SIGNAL(triggered()), this, SLOT(getWhiteHot()));
+ connect(d_act[3], SIGNAL(triggered()), this, SLOT(getBlackHot()));
+ connect(d_act[4], SIGNAL(triggered()), this, SLOT(getBlackRed()));
+ connect(d_act[5], SIGNAL(triggered()), this, SLOT(getOther()));
+
+ QListIterator<QAction*> i(d_act);
+ while(i.hasNext()) {
+ QAction *a = i.next();
+ addAction(a);
+ }
+
+ d_max_value = QColor("black");
+ d_min_value = QColor("black");
+ }
+
+ ~NumberColorMapMenu()
+ {}
+
+ int getNumActions() const
+ {
+ return d_act.size();
+ }
+
+ QAction * getAction(int which)
+ {
+ if(which < d_act.size())
+ return d_act[which];
+ else
+ throw std::runtime_error("ColorMapMenu::getAction: which out of range.\n");
+ }
+
+ signals:
+ void whichTrigger(int which,
+ const QColor &min_color,
+ const QColor &max_color);
+
+ public slots:
+ void getBlack() { emit whichTrigger(d_which, QColor("black"), QColor("black")); }
+ void getBlueRed() { emit whichTrigger(d_which, QColor("blue"), QColor("red")); }
+ void getWhiteHot() { emit whichTrigger(d_which, QColor("black"), QColor("white")); }
+ void getBlackHot() { emit whichTrigger(d_which, QColor("white"), QColor("black")); }
+ void getBlackRed() { emit whichTrigger(d_which, QColor("black"), QColor("red")); }
+ void getOther()
+ {
+ QMessageBox::information(this, "Set low and high intensities",
+ "In the next windows, select the low and then the high intensity colors.",
+ QMessageBox::Ok);
+ d_min_value = QColorDialog::getColor(d_min_value, this);
+ d_max_value = QColorDialog::getColor(d_max_value, this);
+
+ emit whichTrigger(d_which, d_min_value, d_max_value);
+ }
+
+private:
+ QList<QAction *> d_act;
+ QColor d_max_value, d_min_value;
+ int d_which;
+};
+
+
+/********************************************************************/
+
+
class PopupMenu: public QAction
{
Q_OBJECT
@@ -1308,7 +1479,7 @@ public slots:
private slots:
void getText()
- {
+ {
emit whichTrigger(d_text->text());
d_diag->accept();
}
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
index d0a4a3dba0..fcbfd72ec3 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
@@ -34,7 +34,7 @@
namespace gr {
namespace qtgui {
-
+
/*!
* \brief A graphical sink to display multiple signals in frequency.
* \ingroup instrumentation_blk
@@ -71,9 +71,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
index 25a4c80b49..c49b9d9ec0 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
@@ -71,9 +71,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
index 07ad124c3b..96d2b57732 100644
--- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h
@@ -85,9 +85,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
public:
diff --git a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h
index 16a64b703a..e235f1c0be 100644
--- a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h
@@ -73,12 +73,13 @@ private:
bool d_semilogx;
bool d_semilogy;
-
+
NPointsMenu *d_nptsmenu;
- NPointsMenu *d_nbinsmenu;
+ NPointsMenu *d_nbinsmenu;
QAction *d_semilogxmenu;
QAction *d_semilogymenu;
+ QAction *d_accum_act;
QAction *d_autoscalex_act;
bool d_autoscalex_state;
};
diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h
new file mode 100644
index 0000000000..a34eab38a5
--- /dev/null
+++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h
@@ -0,0 +1,108 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QTGUI_NUMBER_SINK_H
+#define INCLUDED_QTGUI_NUMBER_SINK_H
+
+#ifdef ENABLE_PYTHON
+#include <Python.h>
+#endif
+
+#include <gnuradio/qtgui/api.h>
+#include <gnuradio/qtgui/trigger_mode.h>
+#include <gnuradio/qtgui/qtgui_types.h>
+#include <gnuradio/sync_block.h>
+#include <qapplication.h>
+
+namespace gr {
+ namespace qtgui {
+
+ /*!
+ * \brief A graphical sink to display numerical values of input streams.
+ * \ingroup instrumentation_blk
+ * \ingroup qtgui_blk
+ *
+ * \details
+ * Number sink
+ */
+ class QTGUI_API number_sink : virtual public sync_block
+ {
+ public:
+
+ // gr::qtgui::number_sink::sptr
+ typedef boost::shared_ptr<number_sink> sptr;
+
+ /*!
+ * \brief Build a number sink
+ *
+ * \param itemsize Size of input item stream
+ * \param average Averaging coefficient (0 - 1)
+ * \param graph_type Type of graph to use (number_sink::graph_t)
+ * \param nconnections number of signals connected to sink
+ * \param parent a QWidget parent object, if any
+ */
+ static sptr make(size_t itemsize,
+ float average=0,
+ graph_t graph_type=NUM_GRAPH_HORIZ,
+ int nconnections=1,
+ QWidget *parent=NULL);
+
+ virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
+
+#ifdef ENABLE_PYTHON
+ virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
+#endif
+
+ virtual void set_update_time(double t) = 0;
+ virtual void set_average(const float avg) = 0;
+ virtual void set_graph_type(const graph_t type) = 0;
+ virtual void set_color(int which,
+ const std::string &min,
+ const std::string &max) = 0;
+ virtual void set_color(int which, int min, int max) = 0;
+ virtual void set_label(int which, const std::string &label) = 0;
+ virtual void set_min(int which, float min) = 0;
+ virtual void set_max(int which, float max) = 0;
+
+ virtual float average() const = 0;
+ virtual graph_t graph_type() const = 0;
+ virtual std::string color_min(int which) const = 0;
+ virtual std::string color_max(int which) const = 0;
+ virtual std::string label(int which) const = 0;
+ virtual float min(int which) const = 0;
+ virtual float max(int which) const = 0;
+
+ virtual void enable_menu(bool en=true) = 0;
+ virtual void enable_autoscale(bool en=true) = 0;
+
+ virtual void reset() = 0;
+
+ QApplication *d_qApplication;
+ };
+
+ } /* namespace qtgui */
+} /* namespace gr */
+
+#endif /* INCLUDED_QTGUI_NUMBER_SINK_H */
diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
new file mode 100644
index 0000000000..c33f9b455f
--- /dev/null
+++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
@@ -0,0 +1,105 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef NUMBER_DISPLAY_FORM_H
+#define NUMBER_DISPLAY_FORM_H
+
+#include <gnuradio/qtgui/spectrumUpdateEvents.h>
+#include <gnuradio/qtgui/form_menus.h>
+#include <QtGui/QtGui>
+#include <qwt_thermo.h>
+#include <vector>
+
+/*!
+ * \brief DisplayForm child for managing number sink plots.
+ * \ingroup qtgui_blk
+ */
+class NumberDisplayForm : public QWidget
+{
+ Q_OBJECT
+
+ public:
+ NumberDisplayForm(int nplots=1,
+ gr::qtgui::graph_t type=gr::qtgui::NUM_GRAPH_HORIZ,
+ QWidget* parent = 0);
+ ~NumberDisplayForm();
+
+ gr::qtgui::graph_t graphType() const;
+ QColor colorMin(int which) const;
+ QColor colorMax(int which) const;
+ std::string label(int which) const;
+ float average() const;
+ float updateTime() const;
+ int scaleMin(int which);
+ int scaleMax(int which);
+
+public slots:
+ void mousePressEvent(QMouseEvent * e);
+ void customEvent(QEvent * e);
+ void setStop(bool on);
+ void setStop();
+ void setGraphType(const gr::qtgui::graph_t type);
+ void setColor(int which, const QColor &min, const QColor &max);
+ void setColorMin(int which, QString min);
+ void setColorMax(int which, QString max);
+ void setLabel(int which, const std::string &label);
+ void setLabel(int which, QString label);
+ void setAverage(const float avg);
+ void setUpdateTime(const float time);
+ void setUpdateTime(QString time);
+ void saveFigure();
+ void setScale(int which, int min, int max);
+ void setScaleMin(int which, int min);
+ void setScaleMax(int which, int max);
+ void autoScale(bool on);
+
+private slots:
+ void newData(const QEvent*);
+
+private:
+ int d_nplots;
+ QGridLayout *d_layout;
+ std::vector<QLabel*> d_label;
+ std::vector<QLabel*> d_text_box;
+ std::vector<QwtThermo*> d_indicator;
+ gr::qtgui::graph_t d_graph_type;
+ float d_avg, d_update_time;
+ std::vector<float> d_max, d_min;
+
+ bool d_menu_on;
+ bool d_stop_state;
+ bool d_autoscale_state;
+
+ QMenu *d_menu;
+ QAction *d_stop_act;
+ QList<QMenu*> d_label_menu;
+ std::vector<LineTitleAction*> d_label_act;
+ FFTAverageMenu *d_avg_menu;
+ NumberLayoutMenu *d_layout_menu;
+ std::vector<NumberColorMapMenu*> d_color_menu;
+ PopupMenu *d_maxcolor_menu;
+ QAction *d_autoscale_act;
+ PopupMenu *d_update_time_menu;
+ QAction *d_save_act;
+};
+
+#endif /* NUMBER_DISPLAY_FORM_H */
diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
index f71ab9eda3..cde52547a9 100644
--- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
+++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
@@ -75,16 +75,16 @@ public:
_zeroTime = 0;
_secondsPerLine = 1.0;
}
-
+
virtual ~TimeScaleData()
- {
+ {
}
virtual gr::high_res_timer_type getZeroTime() const
{
return _zeroTime;
}
-
+
virtual void setZeroTime(const gr::high_res_timer_type newTime)
{
_zeroTime = newTime - gr::high_res_timer_epoch();
@@ -100,13 +100,13 @@ public:
return _secondsPerLine;
}
-
+
protected:
-
+
private:
gr::high_res_timer_type _zeroTime;
double _secondsPerLine;
-
+
};
/***********************************************************************
@@ -136,6 +136,19 @@ private:
};
+namespace gr {
+ namespace qtgui {
+
+ enum graph_t {
+ NUM_GRAPH_NONE = 0,
+ NUM_GRAPH_HORIZ,
+ NUM_GRAPH_VERT,
+ };
+
+ } /* namespace qtgui */
+} /* namespace gr */
+
+
enum{
INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0,
INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1,
diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
index d1c35ebda9..e0c770039f 100644
--- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h
@@ -77,9 +77,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
index 7d56a7a499..0e8004b1ed 100644
--- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h
@@ -77,9 +77,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_fft_size(const int fftsize) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
index dc31ba8601..d26f41e26d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
+++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2008-2013 Free Software Foundation, Inc.
+ * Copyright 2008-2014 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -295,4 +295,28 @@ private:
};
+/********************************************************************/
+
+
+class NumberUpdateEvent: public QEvent
+{
+public:
+ NumberUpdateEvent(const std::vector<float> samples);
+ ~NumberUpdateEvent();
+
+ int which() const;
+ const std::vector<float> getSamples() const;
+
+ static QEvent::Type Type()
+ { return QEvent::Type(SpectrumUpdateEventType); }
+
+protected:
+
+private:
+ size_t _nplots;
+ std::vector<float> _samples;
+};
+
+
+
#endif /* SPECTRUM_UPDATE_EVENTS_H */
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 5304dd4f84..586007bf5f 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h
@@ -76,9 +76,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_update_time(double t) = 0;
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 2c13265ae5..2c7699d923 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h
@@ -73,9 +73,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_update_time(double t) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
index f02226cb8e..2d5248552b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h
@@ -69,9 +69,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_y_axis(double min, double max) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
index 64e347bf83..add53ef603 100644
--- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h
@@ -67,9 +67,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void set_y_axis(double min, double max) = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
index e1e27a4cc8..17a656949e 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
@@ -78,9 +78,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void clear_data() = 0;
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
index 006f592bb5..3877158e7c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
@@ -77,9 +77,12 @@ namespace gr {
QWidget *parent=NULL);
virtual void exec_() = 0;
+ virtual QWidget* qwidget() = 0;
#ifdef ENABLE_PYTHON
virtual PyObject* pyqwidget() = 0;
+#else
+ virtual void* pyqwidget() = 0;
#endif
virtual void clear_data() = 0;
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index afaadb929b..f46fe838a3 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -30,6 +30,7 @@ set(qtgui_moc_hdrs
${qtgui_mod_includedir}/constellationdisplayform.h
${qtgui_mod_includedir}/waterfalldisplayform.h
${qtgui_mod_includedir}/histogramdisplayform.h
+ ${qtgui_mod_includedir}/numberdisplayform.h
${qtgui_mod_includedir}/form_menus.h
${qtgui_mod_includedir}/DisplayPlot.h
${qtgui_mod_includedir}/FrequencyDisplayPlot.h
@@ -38,6 +39,7 @@ set(qtgui_moc_hdrs
${qtgui_mod_includedir}/WaterfallDisplayPlot.h
${qtgui_mod_includedir}/ConstellationDisplayPlot.h
${qtgui_mod_includedir}/HistogramDisplayPlot.h
+ ${qtgui_mod_includedir}/NumberDisplayPlot.h
)
QT4_WRAP_CPP(qtgui_moc_srcs ${qtgui_moc_hdrs})
QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui)
@@ -68,6 +70,8 @@ set(qtgui_srcs
freqdisplayform.cc
constellationdisplayform.cc
histogramdisplayform.cc
+ NumberDisplayPlot.cc
+ numberdisplayform.cc
waterfalldisplayform.cc
SpectrumGUIClass.cc
spectrumUpdateEvents.cc
@@ -85,6 +89,7 @@ set(qtgui_srcs
waterfall_sink_c_impl.cc
waterfall_sink_f_impl.cc
histogram_sink_f_impl.cc
+ number_sink_impl.cc
qtgui_util.cc
)
diff --git a/gr-qtgui/lib/NumberDisplayPlot.cc b/gr-qtgui/lib/NumberDisplayPlot.cc
new file mode 100644
index 0000000000..b1fbca9ded
--- /dev/null
+++ b/gr-qtgui/lib/NumberDisplayPlot.cc
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef NUMBER_DISPLAY_PLOT_C
+#define NUMBER_DISPLAY_PLOT_C
+
+#include <gnuradio/qtgui/NumberDisplayPlot.h>
+
+#include <qwt_scale_draw.h>
+#include <QColor>
+#include <cmath>
+#include <iostream>
+#include <volk/volk.h>
+
+NumberDisplayPlot::NumberDisplayPlot(int nplots, QWidget* parent)
+ : DisplayPlot(nplots, parent)
+{
+ resize(0, 0);
+
+ // Setup dataPoints and plot vectors
+ // Automatically deleted when parent is deleted
+ for(int i = 0; i < d_nplots; i++) {
+
+ }
+}
+
+NumberDisplayPlot::~NumberDisplayPlot()
+{
+}
+
+void
+NumberDisplayPlot::replot()
+{
+ QwtPlot::replot();
+}
+
+void
+NumberDisplayPlot::plotNewData(const std::vector<double> samples)
+{
+ if(!d_stop) {
+ }
+}
+
+#endif /* NUMBER_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
index bc4b411958..fb0cdade6a 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -148,6 +148,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ const_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h
index e2faa72eb0..3b1de226ff 100644
--- a/gr-qtgui/lib/const_sink_c_impl.h
+++ b/gr-qtgui/lib/const_sink_c_impl.h
@@ -70,6 +70,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 0f37fe80a4..ff40ff3f43 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -174,6 +174,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ freq_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h
index f068e657f5..15b513715c 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.h
+++ b/gr-qtgui/lib/freq_sink_c_impl.h
@@ -87,6 +87,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index b2054bc96d..b661f7b07b 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -174,6 +174,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ freq_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h
index c7e9fe83dc..68cb8c66b4 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.h
+++ b/gr-qtgui/lib/freq_sink_f_impl.h
@@ -87,6 +87,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc
index 2ea01f33b6..16576b387b 100644
--- a/gr-qtgui/lib/freqdisplayform.cc
+++ b/gr-qtgui/lib/freqdisplayform.cc
@@ -173,6 +173,7 @@ FreqDisplayForm::autoScale(bool en)
d_autoscale_state = false;
}
+ d_autoscale_act->setChecked(en);
getPlot()->setAutoScale(d_autoscale_state);
getPlot()->replot();
}
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc
index 4b3aa29693..dc3e63cb01 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -150,6 +150,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ histogram_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h
index e2558890b9..58d43e49d1 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.h
+++ b/gr-qtgui/lib/histogram_sink_f_impl.h
@@ -72,6 +72,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/histogramdisplayform.cc b/gr-qtgui/lib/histogramdisplayform.cc
index 755992a873..c4e9b51f90 100644
--- a/gr-qtgui/lib/histogramdisplayform.cc
+++ b/gr-qtgui/lib/histogramdisplayform.cc
@@ -50,10 +50,10 @@ HistogramDisplayForm::HistogramDisplayForm(int nplots, QWidget* parent)
connect(d_nbinsmenu, SIGNAL(whichTrigger(int)),
this, SLOT(setNumBins(const int)));
- QAction *accummenu = new QAction("Accumulate", this);
- accummenu->setCheckable(true);
- d_menu->addAction(accummenu);
- connect(accummenu, SIGNAL(triggered(bool)),
+ d_accum_act = new QAction("Accumulate", this);
+ d_accum_act->setCheckable(true);
+ d_menu->addAction(d_accum_act);
+ connect(d_accum_act, SIGNAL(triggered(bool)),
this, SLOT(setAccumulate(bool)));
d_menu->removeAction(d_autoscale_act);
@@ -199,6 +199,7 @@ HistogramDisplayForm::setAccumulate(bool en)
if(en) {
autoScale(true);
}
+ d_accum_act->setChecked(en);
getPlot()->setAccumulate(en);
getPlot()->replot();
}
diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc
new file mode 100644
index 0000000000..abfb8725f4
--- /dev/null
+++ b/gr-qtgui/lib/number_sink_impl.cc
@@ -0,0 +1,310 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "number_sink_impl.h"
+#include <gnuradio/io_signature.h>
+#include <string.h>
+#include <volk/volk.h>
+#include <gnuradio/fft/fft.h>
+#include <qwt_symbol.h>
+
+namespace gr {
+ namespace qtgui {
+
+ number_sink::sptr
+ number_sink::make(size_t itemsize,
+ float average,
+ graph_t graph_type,
+ int nconnections,
+ QWidget *parent)
+ {
+ return gnuradio::get_initial_sptr
+ (new number_sink_impl(itemsize, average,
+ graph_type, nconnections, parent));
+ }
+
+ number_sink_impl::number_sink_impl(size_t itemsize,
+ float average,
+ graph_t graph_type,
+ int nconnections,
+ QWidget *parent)
+ : sync_block("number_sink",
+ io_signature::make(nconnections, nconnections, itemsize),
+ io_signature::make(0, 0, 0)),
+ d_itemsize(itemsize), d_average(average),
+ d_type(graph_type), d_nconnections(nconnections), d_parent(parent),
+ d_avg_value(nconnections), d_iir(nconnections)
+ {
+ for(int n = 0; n < d_nconnections; n++) {
+ d_avg_value[n] = 0;
+ d_iir[n].set_taps(d_average);
+ }
+
+ // Required now for Qt; argc must be greater than 0 and argv
+ // must have at least one valid character. Must be valid through
+ // life of the qApplication:
+ // http://harmattan-dev.nokia.com/docs/library/html/qt4/qapplication.html
+ d_argc = 1;
+ d_argv = new char;
+ d_argv[0] = '\0';
+
+ d_main_gui = NULL;
+
+ // Set alignment properties for VOLK
+ const int alignment_multiple =
+ volk_get_alignment() / d_itemsize;
+ set_alignment(std::max(1,alignment_multiple));
+
+ initialize();
+ }
+
+ number_sink_impl::~number_sink_impl()
+ {
+ //if(!d_main_gui->isClosed())
+ // d_main_gui->close();
+
+ delete d_argv;
+ }
+
+ bool
+ number_sink_impl::check_topology(int ninputs, int noutputs)
+ {
+ return ninputs == d_nconnections;
+ }
+
+ void
+ number_sink_impl::initialize()
+ {
+ if(qApp != NULL) {
+ d_qApplication = qApp;
+ }
+ else {
+ d_qApplication = new QApplication(d_argc, &d_argv);
+ }
+
+ d_main_gui = new NumberDisplayForm(d_nconnections, d_type, d_parent);
+
+ // initialize update time to 10 times a second
+ set_update_time(0.1);
+ }
+
+ void
+ number_sink_impl::exec_()
+ {
+ d_qApplication->exec();
+ }
+
+ QWidget*
+ number_sink_impl::qwidget()
+ {
+ return d_main_gui;
+ }
+
+#ifdef ENABLE_PYTHON
+ PyObject*
+ number_sink_impl::pyqwidget()
+ {
+ PyObject *w = PyLong_FromVoidPtr((void*)d_main_gui);
+ PyObject *retarg = Py_BuildValue("N", w);
+ return retarg;
+ }
+#else
+ void *
+ number_sink_impl::pyqwidget()
+ {
+ return NULL;
+ }
+#endif
+
+ void
+ number_sink_impl::set_update_time(double t)
+ {
+ //convert update time to ticks
+ gr::high_res_timer_type tps = gr::high_res_timer_tps();
+ d_main_gui->setUpdateTime(t);
+ d_update_time = t * tps;
+ d_last_time = 0;
+ }
+
+ void
+ number_sink_impl::set_average(const float avg)
+ {
+ d_average = avg;
+ for(int n = 0; n < d_nconnections; n++) {
+ d_avg_value[n] = 0;
+ d_iir[n].set_taps(d_average);
+ }
+ }
+
+ void
+ number_sink_impl::set_graph_type(const graph_t type)
+ {
+ d_main_gui->setGraphType(type);
+ }
+
+ void
+ number_sink_impl::set_color(int which,
+ const std::string &min,
+ const std::string &max)
+ {
+ d_main_gui->setColor(which,
+ QColor(min.c_str()),
+ QColor(max.c_str()));
+ }
+
+ void
+ number_sink_impl::set_color(int which, int min, int max)
+ {
+ d_main_gui->setColor(which, QColor(min), QColor(max));
+ }
+
+ void
+ number_sink_impl::set_label(int which, const std::string &label)
+ {
+ d_main_gui->setLabel(which, label);
+ }
+
+ void
+ number_sink_impl::set_min(int which, float min)
+ {
+ d_main_gui->setScaleMin(which, min);
+ }
+
+ void
+ number_sink_impl::set_max(int which, float max)
+ {
+ return d_main_gui->setScaleMax(which, max);
+ }
+
+ float
+ number_sink_impl::average() const
+ {
+ return d_average;
+ }
+
+ graph_t
+ number_sink_impl::graph_type() const
+ {
+ return d_main_gui->graphType();
+ }
+
+ std::string
+ number_sink_impl::color_min(int which) const
+ {
+ return d_main_gui->colorMin(which).name().toStdString();
+ }
+
+ std::string
+ number_sink_impl::color_max(int which) const
+ {
+ return d_main_gui->colorMax(which).name().toStdString();
+ }
+
+ std::string
+ number_sink_impl::label(int which) const
+ {
+ return d_main_gui->label(which);
+ }
+
+ float
+ number_sink_impl::min(int which) const
+ {
+ return d_main_gui->scaleMin(which);
+ }
+
+ float
+ number_sink_impl::max(int which) const
+ {
+ return d_main_gui->scaleMax(which);
+ }
+
+ void
+ number_sink_impl::enable_menu(bool en)
+ {
+ //d_main_gui->enableMenu(en);
+ }
+
+ void
+ number_sink_impl::enable_autoscale(bool en)
+ {
+ d_main_gui->autoScale(en);
+ }
+
+ void
+ number_sink_impl::reset()
+ {
+ gr::thread::scoped_lock lock(d_mutex);
+ _reset();
+ }
+
+ void
+ number_sink_impl::_reset()
+ {
+ }
+
+ int
+ number_sink_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ gr::thread::scoped_lock lock(d_mutex);
+
+ float new_avg = d_main_gui->average();
+ set_update_time(d_main_gui->updateTime());
+ if(new_avg != d_average) {
+ set_average(new_avg);
+ }
+
+ if(d_average > 0) {
+ for(int n = 0; n < d_nconnections; n++) {
+ float *in = (float*)input_items[n];
+ for(int i = 0; i < noutput_items; i++) {
+ d_avg_value[n] = d_iir[n].filter(in[i]);
+ }
+ }
+ }
+
+ // Plot if we are able to update
+ if(gr::high_res_timer_now() - d_last_time > d_update_time) {
+ d_last_time = gr::high_res_timer_now();
+ std::vector<float> d(d_nconnections);
+ if(d_average > 0) {
+ for(int n = 0; n < d_nconnections; n++)
+ d[n] = d_avg_value[n];
+ }
+ else {
+ for(int n = 0; n < d_nconnections; n++)
+ d[n] = ((float*)input_items[n])[0];
+ }
+ d_qApplication->postEvent(d_main_gui,
+ new NumberUpdateEvent(d));
+ }
+
+ return noutput_items;;
+ }
+
+ } /* namespace qtgui */
+} /* namespace gr */
diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h
new file mode 100644
index 0000000000..0f4fd48262
--- /dev/null
+++ b/gr-qtgui/lib/number_sink_impl.h
@@ -0,0 +1,117 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_QTGUI_NUMBER_SINK_IMPL_H
+#define INCLUDED_QTGUI_NUMBER_SINK_IMPL_H
+
+#include <gnuradio/qtgui/number_sink.h>
+#include <gnuradio/qtgui/numberdisplayform.h>
+#include <gnuradio/filter/single_pole_iir.h>
+#include <gnuradio/thread/thread.h>
+#include <gnuradio/high_res_timer.h>
+
+namespace gr {
+ namespace qtgui {
+
+ class QTGUI_API number_sink_impl : public number_sink
+ {
+ private:
+ void initialize();
+
+ gr::thread::mutex d_mutex;
+
+ size_t d_itemsize;
+ float d_average;
+ graph_t d_type;
+ int d_nconnections;
+
+ int d_index, d_start, d_end;
+ std::vector<double*> d_buffers;
+ std::vector< std::vector<gr::tag_t> > d_tags;
+
+ int d_argc;
+ char *d_argv;
+ QWidget *d_parent;
+ NumberDisplayForm *d_main_gui;
+
+ std::vector<float> d_avg_value;
+ std::vector<filter::single_pole_iir<float,float,float> > d_iir;
+
+ gr::high_res_timer_type d_update_time;
+ gr::high_res_timer_type d_last_time;
+
+ void _reset();
+ void _npoints_resize();
+ void _gui_update_trigger();
+
+ public:
+ number_sink_impl(size_t itemsize,
+ float average=0,
+ graph_t graph_type=NUM_GRAPH_HORIZ,
+ int nconnections=1,
+ QWidget *parent=NULL);
+ ~number_sink_impl();
+
+ bool check_topology(int ninputs, int noutputs);
+
+ void exec_();
+ QWidget* qwidget();
+
+#ifdef ENABLE_PYTHON
+ PyObject* pyqwidget();
+#else
+ void* pyqwidget();
+#endif
+
+ void set_update_time(double t);
+ void set_average(const float avg);
+ void set_graph_type(const graph_t type);
+ void set_color(int which,
+ const std::string &min,
+ const std::string &max);
+ void set_color(int which, int min, int max);
+ void set_label(int which, const std::string &label);
+ void set_min(int which, float min);
+ void set_max(int which, float max);
+
+ float average() const;
+ graph_t graph_type() const;
+ std::string color_min(int which) const;
+ std::string color_max(int which) const;
+ std::string label(int which) const;
+ float min(int which) const;
+ float max(int which) const;
+
+ void enable_menu(bool en);
+ void enable_autoscale(bool en=true);
+
+ void reset();
+
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } /* namespace qtgui */
+} /* namespace gr */
+
+#endif /* INCLUDED_QTGUI_NUMBER_SINK_IMPL_H */
diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc
new file mode 100644
index 0000000000..b2b3fe453a
--- /dev/null
+++ b/gr-qtgui/lib/numberdisplayform.cc
@@ -0,0 +1,441 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2014 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <cmath>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <gnuradio/qtgui/numberdisplayform.h>
+#include <iostream>
+#include <qwt_color_map.h>
+
+NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type,
+ QWidget* parent)
+ : QWidget(parent)
+{
+ d_nplots = nplots;
+ d_layout = new QGridLayout(this);
+ for(int i = 0; i < d_nplots; i++) {
+ d_min.push_back(+1e32);
+ d_max.push_back(-1e32);
+ d_label.push_back(new QLabel(QString("Data %1").arg(i)));
+ d_text_box.push_back(new QLabel(QString("0")));
+
+ d_indicator.push_back(new QwtThermo());
+ d_indicator[i]->setScale(-1, 1);
+
+#if QWT_VERSION < 0x060100
+#else
+ d_indicator[i]->setOriginMode(QwtThermo::OriginCustom);
+ d_indicator[i]->setOrigin(0.0);
+#endif /* if QWT_VERSION < 0x060100 */
+
+ switch(type) {
+ case(gr::qtgui::NUM_GRAPH_HORIZ):
+#if QWT_VERSION < 0x060100
+ d_indicator[i]->setOrientation(Qt::Horizontal, QwtThermo::BottomScale);
+#else
+ d_indicator[i]->setOrientation(Qt::Horizontal);
+#endif /* if QWT_VERSION < 0x060100 */
+ d_layout->addWidget(d_label[i], 2*i, 0);
+ d_layout->addWidget(d_text_box[i], 2*i, 1);
+ d_layout->addWidget(d_indicator[i], 2*i+1, 1);
+ break;
+ case(gr::qtgui::NUM_GRAPH_VERT):
+#if QWT_VERSION < 0x060100
+ d_indicator[i]->setOrientation(Qt::Vertical, QwtThermo::LeftScale);
+#else
+ d_indicator[i]->setOrientation(Qt::Vertical);
+#endif /* if QWT_VERSION < 0x060100 */
+ d_layout->addWidget(d_label[i], 0, i);
+ d_layout->addWidget(d_text_box[i], 1, i);
+ d_layout->addWidget(d_indicator[i], 2, i);
+ break;
+ case(gr::qtgui::NUM_GRAPH_NONE):
+ default:
+ d_layout->addWidget(d_label[i], 0, i);
+ d_layout->addWidget(d_text_box[i], 1, i);
+ }
+
+ setColor(i, QColor("black"), QColor("black"));
+ }
+
+ d_avg = 0.0;
+ d_update_time = 0.1;
+
+ d_menu_on = true;
+ d_menu = new QMenu(this);
+
+ // Create a set of actions for the menu
+ d_stop_act = new QAction("Stop", this);
+ d_stop_act->setStatusTip(tr("Start/Stop"));
+ connect(d_stop_act, SIGNAL(triggered()), this, SLOT(setStop()));
+ d_stop_state = false;
+ d_menu->addAction(d_stop_act);
+
+ // Menu items for each number line
+ for(int i = 0; i < d_nplots; i++) {
+ d_label_act.push_back(new LineTitleAction(i, this));
+ connect(d_label_act[i], SIGNAL(whichTrigger(int, const QString&)),
+ this, SLOT(setLabel(int, const QString&)));
+
+ d_label_menu.push_back(new QMenu(tr(""), this));
+ d_label_menu[i]->addAction(d_label_act[i]);
+
+ d_color_menu.push_back(new NumberColorMapMenu(i, this));
+ connect(d_color_menu[i], SIGNAL(whichTrigger(int, const QColor&, const QColor&)),
+ this, SLOT(setColor(int, const QColor&, const QColor&)));
+ d_label_menu[i]->addMenu(d_color_menu[i]);
+
+ d_menu->addMenu(d_label_menu[i]);
+ }
+
+ d_avg_menu = new FFTAverageMenu(this);
+ d_avg_menu->setTitle("Average");
+ d_avg_menu->setHigh(0.001);
+ d_avg_menu->setMedium(0.01);
+ d_avg_menu->setLow(0.1);
+ connect(d_avg_menu, SIGNAL(whichTrigger(float)),
+ this, SLOT(setAverage(const float)));
+ d_menu->addMenu(d_avg_menu);
+
+ d_layout_menu = new NumberLayoutMenu(this);
+ connect(d_layout_menu, SIGNAL(whichTrigger(gr::qtgui::graph_t)),
+ this, SLOT(setGraphType(const gr::qtgui::graph_t)));
+ d_menu->addMenu(d_layout_menu);
+
+ d_autoscale_act = new QAction("Auto Scale", this);
+ d_autoscale_act->setCheckable(true);
+ connect(d_autoscale_act, SIGNAL(triggered(bool)),
+ this, SLOT(autoScale(bool)));
+ d_autoscale_state = false;
+ d_menu->addAction(d_autoscale_act);
+
+ d_update_time_menu = new PopupMenu("Update Time", this);
+ connect(d_update_time_menu, SIGNAL(whichTrigger(QString)),
+ this, SLOT(setUpdateTime(QString)));
+ d_menu->addAction(d_update_time_menu);
+
+ d_save_act = new QAction("Save", this);
+ d_save_act->setStatusTip(tr("Save Figure"));
+ connect(d_save_act, SIGNAL(triggered()), this, SLOT(saveFigure()));
+ d_menu->addAction(d_save_act);
+
+ setLayout(d_layout);
+}
+
+NumberDisplayForm::~NumberDisplayForm()
+{
+ // Qt deletes children when parent is deleted
+}
+
+void
+NumberDisplayForm::mousePressEvent(QMouseEvent * e)
+{
+ bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers();
+ if((e->button() == Qt::MidButton) && ctrloff && (d_menu_on)) {
+ if(d_stop_state == false)
+ d_stop_act->setText(tr("Stop"));
+ else
+ d_stop_act->setText(tr("Start"));
+
+ // Update the line titles if changed externally
+ for(int i = 0; i < d_nplots; i++) {
+ d_label_menu[i]->setTitle(label(i).c_str());
+ }
+ d_menu->exec(e->globalPos());
+ }
+}
+
+void
+NumberDisplayForm::setStop(bool on)
+{
+ if(!on) {
+ d_stop_state = false;
+ }
+ else {
+ d_stop_state = true;
+ }
+}
+
+void
+NumberDisplayForm::setStop()
+{
+ if(d_stop_state == false)
+ setStop(true);
+ else
+ setStop(false);
+}
+
+void
+NumberDisplayForm::saveFigure()
+{
+ QPixmap qpix = QPixmap::grabWidget(this);
+
+ QString types = QString(tr("JPEG file (*.jpg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp);;TIFF file (*.tiff)"));
+
+ QString filename, filetype;
+ QFileDialog *filebox = new QFileDialog(0, "Save Image", "./", types);
+ filebox->setViewMode(QFileDialog::Detail);
+ if(filebox->exec()) {
+ filename = filebox->selectedFiles()[0];
+ filetype = filebox->selectedNameFilter();
+ }
+ else {
+ return;
+ }
+
+ if(filetype.contains(".jpg")) {
+ qpix.save(filename, "JPEG");
+ }
+ else if(filetype.contains(".png")) {
+ qpix.save(filename, "PNG");
+ }
+ else if(filetype.contains(".bmp")) {
+ qpix.save(filename, "BMP");
+ }
+ else if(filetype.contains(".tiff")) {
+ qpix.save(filename, "TIFF");
+ }
+ else {
+ qpix.save(filename, "JPEG");
+ }
+
+ delete filebox;
+}
+
+void
+NumberDisplayForm::newData(const QEvent* updateEvent)
+{
+ if(!d_stop_state) {
+ NumberUpdateEvent *tevent = (NumberUpdateEvent*)updateEvent;
+ const std::vector<float> samples = tevent->getSamples();
+
+ for(int i = 0; i < d_nplots; i++) {
+ d_text_box[i]->setText(QString("%1").arg(samples[i], 4, ' '));
+ d_indicator[i]->setValue(samples[i]);
+ d_min[i] = std::min(d_min[i], samples[i]);
+ d_max[i] = std::max(d_max[i], samples[i]);
+
+ if(d_autoscale_state) {
+ d_indicator[i]->setScale(d_min[i], d_max[i]);
+ }
+ }
+
+ }
+}
+
+void
+NumberDisplayForm::customEvent(QEvent * e)
+{
+ if(e->type() == NumberUpdateEvent::Type()) {
+ newData(e);
+ }
+}
+
+void
+NumberDisplayForm::setGraphType(const gr::qtgui::graph_t type)
+{
+ d_graph_type = type;
+ for(int i = 0; i < d_nplots; i++) {
+ d_layout->removeWidget(d_indicator[i]);
+ d_layout->removeWidget(d_label[i]);
+ d_layout->removeWidget(d_text_box[i]);
+
+ switch(d_graph_type) {
+ case(gr::qtgui::NUM_GRAPH_HORIZ):
+#if QWT_VERSION < 0x060100
+ d_indicator[i]->setOrientation(Qt::Horizontal, QwtThermo::BottomScale);
+#else
+ d_indicator[i]->setOrientation(Qt::Horizontal);
+#endif /* if QWT_VERSION < 0x060100 */
+ d_indicator[i]->setVisible(true);
+ d_layout->addWidget(d_label[i], 2*i, 0);
+ d_layout->addWidget(d_text_box[i], 2*i, 1);
+ d_layout->addWidget(d_indicator[i], 2*i+1, 1);
+ break;
+ case(gr::qtgui::NUM_GRAPH_VERT):
+#if QWT_VERSION < 0x060100
+ d_indicator[i]->setOrientation(Qt::Vertical, QwtThermo::LeftScale);
+#else
+ d_indicator[i]->setOrientation(Qt::Vertical);
+#endif /* if QWT_VERSION < 0x060100 */
+ d_indicator[i]->setVisible(true);
+ d_layout->addWidget(d_label[i], 0, i);
+ d_layout->addWidget(d_text_box[i], 1, i);
+ d_layout->addWidget(d_indicator[i], 2, i);
+ break;
+ case(gr::qtgui::NUM_GRAPH_NONE):
+ default:
+ d_indicator[i]->setVisible(false);
+ d_layout->addWidget(d_label[i], 0, i);
+ d_layout->addWidget(d_text_box[i], 1, i);
+ break;
+ }
+ }
+
+}
+
+void
+NumberDisplayForm::setColor(int which, const QColor &min, const QColor &max)
+{
+ QwtLinearColorMap *map = new QwtLinearColorMap();
+ map->setColorInterval(min, max);
+
+#if QWT_VERSION < 0x060000
+ d_indicator[which]->setFillColor(max);
+#else
+ d_indicator[which]->setColorMap(map);
+#endif /* QWT_VERSION < 0x060000 */
+}
+
+void
+NumberDisplayForm::setColorMin(int which, QString min)
+{
+ setColor(which, QColor(min), colorMax(which));
+}
+
+void
+NumberDisplayForm::setColorMax(int which, QString max)
+{
+ setColor(which, colorMin(which), QColor(max));
+}
+
+void
+NumberDisplayForm::setLabel(int which, const std::string &label)
+{
+ d_label[which]->setText(label.c_str());
+}
+
+void
+NumberDisplayForm::setLabel(int which, QString label)
+{
+ d_label[which]->setText(label);
+}
+
+void
+NumberDisplayForm::setAverage(const float avg)
+{
+ d_avg = avg;
+}
+
+void
+NumberDisplayForm::setUpdateTime(const float time)
+{
+ d_update_time = time;
+}
+
+void
+NumberDisplayForm::setUpdateTime(QString time)
+{
+ setUpdateTime(time.toFloat());
+}
+
+void
+NumberDisplayForm::setScale(int which, int min, int max)
+{
+ d_min[which] = min;
+ d_max[which] = max;
+ d_indicator[which]->setScale(min, max);
+}
+
+void
+NumberDisplayForm::setScaleMin(int which, int min)
+{
+ setScale(which, min, d_max[which]);
+}
+
+void
+NumberDisplayForm::setScaleMax(int which, int max)
+{
+ setScale(which, d_min[which], max);
+}
+
+gr::qtgui::graph_t
+NumberDisplayForm::graphType() const
+{
+ return d_graph_type;
+}
+
+QColor
+NumberDisplayForm::colorMin(int which) const
+{
+#if QWT_VERSION < 0x060000
+ return d_indicator[which]->fillColor();
+#else
+ QwtLinearColorMap *map = static_cast<QwtLinearColorMap*>(d_indicator[which]->colorMap());
+ return map->color1();
+#endif /* QWT_VERSION < 0x060000 */
+}
+
+QColor
+NumberDisplayForm::colorMax(int which) const
+{
+#if QWT_VERSION < 0x060000
+ return d_indicator[which]->fillColor();
+#else
+ QwtLinearColorMap *map = static_cast<QwtLinearColorMap*>(d_indicator[which]->colorMap());
+ return map->color2();
+#endif /* QWT_VERSION < 0x060000 */
+}
+
+std::string
+NumberDisplayForm::label(int which) const
+{
+ return d_label[which]->text().toStdString();
+}
+
+float
+NumberDisplayForm::average() const
+{
+ return d_avg;
+}
+
+float
+NumberDisplayForm::updateTime() const
+{
+ return d_update_time;
+}
+
+int
+NumberDisplayForm::scaleMin(int which)
+{
+ return d_min[which];
+}
+
+int
+NumberDisplayForm::scaleMax(int which)
+{
+ return d_max[which];
+}
+
+void
+NumberDisplayForm::autoScale(bool on)
+{
+ d_autoscale_state = on;
+ d_autoscale_act->setChecked(on);
+
+ // Reset the autoscale limits
+ for(int i = 0; i < d_nplots; i++) {
+ d_min.push_back(+1e32);
+ d_max.push_back(-1e32);
+ }
+}
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index 12720bde2f..992512a999 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -180,6 +180,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h
index 56c90f3f80..18508d30aa 100644
--- a/gr-qtgui/lib/sink_c_impl.h
+++ b/gr-qtgui/lib/sink_c_impl.h
@@ -85,6 +85,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index a3567aec94..0a0e119181 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -172,6 +172,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h
index 801a200bb8..68331cc4e6 100644
--- a/gr-qtgui/lib/sink_f_impl.h
+++ b/gr-qtgui/lib/sink_f_impl.h
@@ -83,6 +83,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_fft_size(const int fftsize);
diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc
index 8c822efb4f..f48e079861 100644
--- a/gr-qtgui/lib/spectrumUpdateEvents.cc
+++ b/gr-qtgui/lib/spectrumUpdateEvents.cc
@@ -490,4 +490,26 @@ HistogramUpdateEvent::getNumDataPoints() const
}
+
+/***************************************************************************/
+
+
+NumberUpdateEvent::NumberUpdateEvent(const std::vector<float> samples)
+ : QEvent(QEvent::Type(SpectrumUpdateEventType))
+{
+ _samples = samples;
+ _nplots = samples.size();
+}
+
+NumberUpdateEvent::~NumberUpdateEvent()
+{
+}
+
+const std::vector<float>
+NumberUpdateEvent::getSamples() const
+{
+ return _samples;
+}
+
+
#endif /* SPECTRUM_UPDATE_EVENTS_C */
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index 5e5a9f505d..a1189f4413 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -169,6 +169,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_raster_sink_b_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h
index 680056822c..bd568e91c0 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.h
@@ -78,6 +78,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_update_time(double t);
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index a68a503c7a..c8b865d55d 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -167,6 +167,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_raster_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h
index f7caf75842..1e0dcf8370 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.h
@@ -77,6 +77,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_update_time(double t);
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 0f723f8b3d..e86ffca227 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -153,6 +153,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h
index 03dcbe2fc0..6a75789059 100644
--- a/gr-qtgui/lib/time_sink_c_impl.h
+++ b/gr-qtgui/lib/time_sink_c_impl.h
@@ -88,6 +88,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index f547185415..e571654615 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -155,6 +155,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ time_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h
index bbad48dc48..7505642389 100644
--- a/gr-qtgui/lib/time_sink_f_impl.h
+++ b/gr-qtgui/lib/time_sink_f_impl.h
@@ -88,6 +88,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void set_y_axis(double min, double max);
diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc
index 0121e2f544..382e91607c 100644
--- a/gr-qtgui/lib/timerasterdisplayform.cc
+++ b/gr-qtgui/lib/timerasterdisplayform.cc
@@ -61,6 +61,11 @@ TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots,
// Now create our own menus
for(int i = 0; i < nplots; i++) {
+ d_line_title_act.push_back(new LineTitleAction(i, this));
+ connect(d_line_title_act[i], SIGNAL(whichTrigger(int, const QString&)),
+ this, SLOT(setLineLabel(int, const QString&)));
+ d_lines_menu[i]->addAction(d_line_title_act[i]);
+
ColorMapMenu *colormap = new ColorMapMenu(i, this);
connect(colormap, SIGNAL(whichTrigger(int, const int, const QColor&, const QColor&)),
this, SLOT(setColorMap(int, const int, const QColor&, const QColor&)));
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index ded93d19d3..2c436db789 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -173,6 +173,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ waterfall_sink_c_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h
index 95781c564d..aad4a4debb 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.h
@@ -85,6 +85,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void clear_data();
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index bb6c3e050d..fc6d9fab67 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -172,6 +172,12 @@ namespace gr {
PyObject *retarg = Py_BuildValue("N", w);
return retarg;
}
+#else
+ void *
+ waterfall_sink_f_impl::pyqwidget()
+ {
+ return NULL;
+ }
#endif
void
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h
index 97c6aa2def..172f873a7f 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.h
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.h
@@ -85,6 +85,8 @@ namespace gr {
#ifdef ENABLE_PYTHON
PyObject* pyqwidget();
+#else
+ void* pyqwidget();
#endif
void clear_data();
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i
index 234a8791b5..b753a666e8 100644
--- a/gr-qtgui/swig/qtgui_swig.i
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -28,6 +28,27 @@
//load generated python docstrings
%include "qtgui_swig_doc.i"
+namespace gr {
+ namespace qtgui {
+
+ enum graph_t {
+ NUM_GRAPH_NONE = 0,
+ NUM_GRAPH_HORIZ,
+ NUM_GRAPH_VERT,
+ };
+
+ } /* namespace qtgui */
+} /* namespace gr */
+
+
+enum{
+ INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0,
+ INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1,
+ INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2,
+ INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3,
+ INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4
+};
+
%include "gnuradio/qtgui/trigger_mode.h"
// So we understand the firdes window types
@@ -49,6 +70,7 @@
#include "gnuradio/qtgui/waterfall_sink_c.h"
#include "gnuradio/qtgui/waterfall_sink_f.h"
#include "gnuradio/qtgui/histogram_sink_f.h"
+#include "gnuradio/qtgui/number_sink.h"
%}
%include "gnuradio/qtgui/sink_c.h"
@@ -63,6 +85,7 @@
%include "gnuradio/qtgui/waterfall_sink_c.h"
%include "gnuradio/qtgui/waterfall_sink_f.h"
%include "gnuradio/qtgui/histogram_sink_f.h"
+%include "gnuradio/qtgui/number_sink.h"
GR_SWIG_BLOCK_MAGIC2(qtgui, sink_c);
GR_SWIG_BLOCK_MAGIC2(qtgui, sink_f);
@@ -76,3 +99,4 @@ GR_SWIG_BLOCK_MAGIC2(qtgui, const_sink_c);
GR_SWIG_BLOCK_MAGIC2(qtgui, waterfall_sink_c);
GR_SWIG_BLOCK_MAGIC2(qtgui, waterfall_sink_f);
GR_SWIG_BLOCK_MAGIC2(qtgui, histogram_sink_f);
+GR_SWIG_BLOCK_MAGIC2(qtgui, number_sink);
diff --git a/gr-uhd/python/uhd/qa_uhd.py b/gr-uhd/python/uhd/qa_uhd.py
index 511c098753..4df0d4273e 100644
--- a/gr-uhd/python/uhd/qa_uhd.py
+++ b/gr-uhd/python/uhd/qa_uhd.py
@@ -35,6 +35,14 @@ class test_uhd(gr_unittest.TestCase):
They may not have a UHD device connected, etc. Don't try to run anything"""
pass
+ def test_time_spec_t (self):
+ seconds = 42.0
+ time = uhd.time_spec_t(seconds)
+ twice_time = time + time;
+ zero_time = time - time;
+ self.assertEqual(time.get_real_secs() * 2, seconds * 2 )
+ self.assertEqual(time.get_real_secs() - time.get_real_secs() , 0.0)
+
def test_stream_args_channel_foo(self):
"""
Try to manipulate the stream args channels for proper swig'ing checks.
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index c98416f307..4eaef9112d 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -84,6 +84,21 @@
%include <uhd/types/time_spec.hpp>
+%extend uhd::time_spec_t{
+ uhd::time_spec_t __add__(const uhd::time_spec_t &what)
+ {
+ uhd::time_spec_t temp = *self;
+ temp += what;
+ return temp;
+ }
+ uhd::time_spec_t __sub__(const uhd::time_spec_t &what)
+ {
+ uhd::time_spec_t temp = *self;
+ temp -= what;
+ return temp;
+ }
+};
+
%include <uhd/types/stream_cmd.hpp>
%include <uhd/types/clock_config.hpp>
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
index 1d2e37b6a6..50cba851ae 100644
--- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
@@ -84,6 +84,7 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
# Find gnuradio build dependencies
########################################################################
find_package(CppUnit)
+find_package(Doxygen)
# Search for GNU Radio and its components and versions. Add any
# components required to the list of GR_REQUIRED_COMPONENTS (in all
@@ -97,6 +98,15 @@ if(NOT CPPUNIT_FOUND)
endif()
########################################################################
+# Setup doxygen option
+########################################################################
+if(DOXYGEN_FOUND)
+ option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
+else(DOXYGEN_FOUND)
+ option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
+endif(DOXYGEN_FOUND)
+
+########################################################################
# Setup the include and linker paths
########################################################################
include_directories(
diff --git a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in
index 71a6bb920b..55336d5f1d 100644
--- a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in
+++ b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.in
@@ -1,14 +1,16 @@
-# Doxyfile 1.5.7.1
+# Doxyfile 1.8.4
# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed
+# in front of the TAG it is preceding .
+# All text after a hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists items can also be appended using:
# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
#---------------------------------------------------------------------------
# Project related configuration options
@@ -22,8 +24,9 @@
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
PROJECT_NAME = "GNU Radio's HOWTO Package"
@@ -33,6 +36,19 @@ PROJECT_NAME = "GNU Radio's HOWTO Package"
PROJECT_NUMBER =
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
@@ -54,11 +70,11 @@ CREATE_SUBDIRS = NO
# information to generate all constant output in the proper language.
# The default language is English, other supported languages are:
# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
-# Spanish, Swedish, and Ukrainian.
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -112,7 +128,9 @@ FULL_PATH_NAMES = NO
# only done if one of the specified strings matches the left-hand part of
# the path. The tag can be used to show relative paths in the file list.
# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
STRIP_FROM_PATH =
@@ -126,7 +144,7 @@ STRIP_FROM_PATH =
STRIP_FROM_INC_PATH =
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# (but less readable) file names. This can be useful if your file system
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
@@ -181,6 +199,13 @@ TAB_SIZE = 8
ALIASES =
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
# For instance, some of the names that are used will be different. The list
@@ -207,11 +232,40 @@ OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT = YES
+
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# func(std::string) {}). This also makes the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = YES
@@ -227,10 +281,10 @@ CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
@@ -251,6 +305,22 @@ DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields or simple typedef fields will be shown
+# inline in the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO (the default), structs, classes, and unions are shown on a separate
+# page (for HTML and Man pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
# is documented as struct, union, or enum with the name of the typedef. So
# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
@@ -261,21 +331,16 @@ SUBGROUPING = YES
TYPEDEF_HIDES_STRUCT = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 4
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can
+# be an expensive process and often the same symbol appear multiple times in
+# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
+# small doxygen will become slower. If the cache is too large, memory is wasted.
+# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
+# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
+# symbols.
+
+LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
@@ -284,7 +349,7 @@ SYMBOL_CACHE_SIZE = 4
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
# documentation are documented, even if no documentation was available.
# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
@@ -293,6 +358,11 @@ EXTRACT_ALL = YES
EXTRACT_PRIVATE = NO
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
@@ -315,7 +385,7 @@ EXTRACT_LOCAL_METHODS = NO
# extracted and appear in the documentation as a namespace called
# 'anonymous_namespace{file}', where file will be replaced with the base
# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# anonymous namespaces are hidden.
EXTRACT_ANON_NSPACES = NO
@@ -375,6 +445,12 @@ HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
@@ -394,6 +470,16 @@ SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
# hierarchy of group names into alphabetical order. If set to NO (the default)
# the group names will appear in their defined order.
@@ -410,6 +496,15 @@ SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
# The GENERATE_TODOLIST tag can be used to enable (YES) or
# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
@@ -435,15 +530,16 @@ GENERATE_BUGLIST = NO
GENERATE_DEPRECATEDLIST= NO
# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
+# the initial value of a variable or macro consists of for it to appear in
# the documentation. If the initializer consists of more lines than specified
# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
+# The appearance of the initializer of individual variables and macros in the
# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
@@ -455,12 +551,6 @@ MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = NO
-
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
# Folder Tree View (if specified). The default is YES.
@@ -468,7 +558,8 @@ SHOW_DIRECTORIES = NO
SHOW_FILES = YES
# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page. This will remove the Namespaces entry from the Quick Index
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
# and from the Folder Tree View (if specified). The default is YES.
SHOW_NAMESPACES = NO
@@ -483,15 +574,26 @@ SHOW_NAMESPACES = NO
FILE_VERSION_FILTER =
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
LAYOUT_FILE =
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -520,7 +622,7 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
# functions that are documented, but have no documentation for their parameters
# or return value. If set to NO (the default) doxygen will only warn about
# wrong or incomplete parameter documentation, but not about the absence of
@@ -552,7 +654,8 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @top_srcdir@ @top_builddir@
+INPUT = @top_srcdir@ \
+ @top_builddir@
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -566,8 +669,9 @@ INPUT_ENCODING = UTF-8
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
FILE_PATTERNS = *.h \
*.dox
@@ -578,18 +682,20 @@ FILE_PATTERNS = *.h \
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
EXCLUDE = @abs_top_builddir@/docs/doxygen/html \
- @abs_top_builddir@/docs/doxygen/xml \
+ @abs_top_builddir@/docs/doxygen/xml \
@abs_top_builddir@/docs/doxygen/other/doxypy.py \
- @abs_top_builddir@/_CPack_Packages \
+ @abs_top_builddir@/_CPack_Packages \
@abs_top_srcdir@/cmake
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
@@ -667,17 +773,22 @@ IMAGE_PATH =
# by executing (via popen()) the command <filter> <input-file>, where <filter>
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be ignored.
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
INPUT_FILTER =
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
FILTER_PATTERNS = *.py=@top_srcdir@/doc/doxygen/other/doxypy.py
@@ -687,6 +798,21 @@ FILTER_PATTERNS = *.py=@top_srcdir@/doc/doxygen/other/doxypy.py
FILTER_SOURCE_FILES = NO
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
@@ -705,7 +831,7 @@ INLINE_SOURCES = NO
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
STRIP_CODE_COMMENTS = NO
@@ -724,7 +850,8 @@ REFERENCES_RELATION = YES
# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentstion.
+# link to the source code.
+# Otherwise they will link to the documentation.
REFERENCES_LINK_SOURCE = YES
@@ -788,7 +915,14 @@ HTML_FILE_EXTENSION = .html
# The HTML_HEADER tag can be used to specify a personal HTML header for
# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
HTML_HEADER =
@@ -800,27 +934,80 @@ HTML_FOOTER =
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
-HTML_ALIGN_MEMBERS = YES
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
HTML_DYNAMIC_SECTIONS = NO
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
# If the GENERATE_DOCSET tag is set to YES, additional index files
# will be generated that can be used as input for Apple's Xcode 3
# integrated development environment, introduced with OSX 10.5 (Leopard).
@@ -829,7 +1016,8 @@ HTML_DYNAMIC_SECTIONS = NO
# directory and running "make install" will install the docset in
# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
GENERATE_DOCSET = NO
@@ -847,6 +1035,16 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
DOCSET_BUNDLE_ID = org.doxygen.Project
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
@@ -891,10 +1089,10 @@ BINARY_TOC = NO
TOC_EXPAND = YES
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
GENERATE_QHP = NO
@@ -906,57 +1104,99 @@ QCH_FILE =
# The QHP_NAMESPACE tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
+# http://doc.trolltech.com/qthelpproject.html#namespace
QHP_NAMESPACE = org.doxygen.Project
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
QHP_VIRTUAL_FOLDER = doc
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
# be used to specify the location of Qt's qhelpgenerator.
# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file .
+# .qhp file.
QHG_LOCATION =
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
-DISABLE_INDEX = YES
+GENERATE_ECLIPSEHELP = NO
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
-ENUM_VALUES_PER_LINE = 4
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = YES
# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
# structure should be generated to display hierarchical information.
-# If the tag value is set to FRAME, a side panel will be generated
+# If the tag value is set to YES, a side panel will be generated
# containing a tree-like index structure (just like the one that
# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature. Other possible values
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list;
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
-# disables this behavior completely. For backwards compatibility with previous
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
-# respectively.
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
GENERATE_TREEVIEW = YES
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 180
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
# Use this tag to change the font size of Latex formulas included
# as images in the HTML documentation. The default is 10. Note that
# when you change the font size after a successful doxygen run you need
@@ -965,6 +1205,112 @@ TREEVIEW_WIDTH = 180
FORMULA_FONTSIZE = 10
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
+# pieces of code that will be used on startup of the MathJax code.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search
+# engine library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS =
+
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
@@ -982,6 +1328,9 @@ LATEX_OUTPUT = latex
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
LATEX_CMD_NAME = latex
@@ -998,8 +1347,8 @@ MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4 will be used.
PAPER_TYPE = letter
@@ -1015,6 +1364,20 @@ EXTRA_PACKAGES =
LATEX_HEADER =
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
+# or other source files which should be copied to the LaTeX output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
+
+LATEX_EXTRA_FILES =
+
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
# contain links (just like the HTML output) instead of page references
@@ -1041,6 +1404,19 @@ LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -1072,7 +1448,7 @@ COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
@@ -1147,6 +1523,21 @@ XML_DTD =
XML_PROGRAMLISTING = NO
#---------------------------------------------------------------------------
+# configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
+# that can be used to generate PDF.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it. If left blank docbook will be used as the default path.
+
+DOCBOOK_OUTPUT = docbook
+
+#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
@@ -1177,8 +1568,10 @@ GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
# tag is set to NO the size of the Perl module output will be much smaller
# and Perl will parse it just the same.
@@ -1215,7 +1608,7 @@ MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
SEARCH_INCLUDES = YES
@@ -1245,15 +1638,15 @@ PREDEFINED =
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
SKIP_FUNCTION_MACROS = YES
@@ -1261,20 +1654,18 @@ SKIP_FUNCTION_MACROS = YES
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-# TAGFILES = file1 file2 ...
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
TAGFILES =
@@ -1295,6 +1686,12 @@ ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
+# in the related pages index. If set to NO, only the current project's
+# pages will be listed.
+
+EXTERNAL_PAGES = YES
+
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
@@ -1307,9 +1704,8 @@ PERL_PATH = /usr/bin/perl
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
CLASS_DIAGRAMS = YES
@@ -1335,33 +1731,38 @@ HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = @HAVE_DOT@
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
-DOT_FONTNAME = FreeSans
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME = Helvetica
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
DOT_FONTSIZE = 10
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
@@ -1383,6 +1784,15 @@ GROUP_GRAPHS = YES
UML_LOOK = NO
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# manageable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
@@ -1419,11 +1829,11 @@ CALL_GRAPH = NO
CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# will generate a graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
@@ -1431,11 +1841,22 @@ GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
DOT_IMAGE_FORMAT = png
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1447,6 +1868,12 @@ DOT_PATH =
DOTFILE_DIRS =
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
@@ -1493,12 +1920,3 @@ GENERATE_LEGEND = YES
# the various graphs.
DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = NO
diff --git a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
index 50b8aa81d6..57736d7d0c 100644
--- a/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
+++ b/gr-utils/python/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
@@ -1,14 +1,16 @@
-# Doxyfile 1.6.1
+# Doxyfile 1.8.4
# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed
+# in front of the TAG it is preceding .
+# All text after a hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists items can also be appended using:
# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
#---------------------------------------------------------------------------
# Project related configuration options
@@ -22,8 +24,9 @@
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
PROJECT_NAME = @CPACK_PACKAGE_NAME@
@@ -33,6 +36,19 @@ PROJECT_NAME = @CPACK_PACKAGE_NAME@
PROJECT_NUMBER = @CPACK_PACKAGE_VERSION@
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
@@ -56,9 +72,9 @@ CREATE_SUBDIRS = NO
# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -112,7 +128,9 @@ FULL_PATH_NAMES = YES
# only done if one of the specified strings matches the left-hand part of
# the path. The tag can be used to show relative paths in the file list.
# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
STRIP_FROM_PATH =
@@ -126,7 +144,7 @@ STRIP_FROM_PATH =
STRIP_FROM_INC_PATH =
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# (but less readable) file names. This can be useful if your file system
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
@@ -181,6 +199,13 @@ TAB_SIZE = 8
ALIASES =
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
# For instance, some of the names that are used will be different. The list
@@ -207,22 +232,40 @@ OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
EXTENSION_MAPPING =
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT = YES
+
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# func(std::string) {}). This also makes the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = YES
@@ -238,10 +281,10 @@ CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
@@ -262,6 +305,22 @@ DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields or simple typedef fields will be shown
+# inline in the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO (the default), structs, classes, and unions are shown on a separate
+# page (for HTML and Man pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
# is documented as struct, union, or enum with the name of the typedef. So
# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
@@ -272,21 +331,16 @@ SUBGROUPING = YES
TYPEDEF_HIDES_STRUCT = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can
+# be an expensive process and often the same symbol appear multiple times in
+# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
+# small doxygen will become slower. If the cache is too large, memory is wasted.
+# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
+# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
+# symbols.
+
+LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
@@ -295,7 +349,7 @@ SYMBOL_CACHE_SIZE = 0
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
# documentation are documented, even if no documentation was available.
# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
@@ -304,6 +358,11 @@ EXTRACT_ALL = YES
EXTRACT_PRIVATE = NO
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
@@ -326,7 +385,7 @@ EXTRACT_LOCAL_METHODS = NO
# extracted and appear in the documentation as a namespace called
# 'anonymous_namespace{file}', where file will be replaced with the base
# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# anonymous namespaces are hidden.
EXTRACT_ANON_NSPACES = NO
@@ -386,6 +445,12 @@ HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
@@ -405,7 +470,13 @@ SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
SORT_MEMBERS_CTORS_1ST = NO
@@ -425,6 +496,15 @@ SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
# The GENERATE_TODOLIST tag can be used to enable (YES) or
# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
@@ -450,15 +530,16 @@ GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
+# the initial value of a variable or macro consists of for it to appear in
# the documentation. If the initializer consists of more lines than specified
# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
+# The appearance of the initializer of individual variables and macros in the
# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
@@ -470,12 +551,6 @@ MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = NO
-
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
# Folder Tree View (if specified). The default is YES.
@@ -499,15 +574,26 @@ SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
LAYOUT_FILE =
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -536,7 +622,7 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
# functions that are documented, but have no documentation for their parameters
# or return value. If set to NO (the default) doxygen will only warn about
# wrong or incomplete parameter documentation, but not about the absence of
@@ -582,8 +668,9 @@ INPUT_ENCODING = UTF-8
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
FILE_PATTERNS = *.h
@@ -593,14 +680,16 @@ FILE_PATTERNS = *.h
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
EXCLUDE =
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
@@ -653,8 +742,10 @@ IMAGE_PATH =
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
# input file. Doxygen will then use the output that the filter program writes
# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# If FILTER_PATTERNS is specified, this tag will be ignored.
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
INPUT_FILTER =
@@ -664,8 +755,8 @@ INPUT_FILTER =
# filter if there is a match.
# The filters are a list of the form:
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
FILTER_PATTERNS =
@@ -675,6 +766,21 @@ FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
@@ -693,7 +799,7 @@ INLINE_SOURCES = NO
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
STRIP_CODE_COMMENTS = YES
@@ -777,7 +883,14 @@ HTML_FILE_EXTENSION = .html
# The HTML_HEADER tag can be used to specify a personal HTML header for
# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
HTML_HEADER =
@@ -789,27 +902,80 @@ HTML_FOOTER =
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
-HTML_ALIGN_MEMBERS = YES
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
HTML_DYNAMIC_SECTIONS = NO
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
# If the GENERATE_DOCSET tag is set to YES, additional index files
# will be generated that can be used as input for Apple's Xcode 3
# integrated development environment, introduced with OSX 10.5 (Leopard).
@@ -818,7 +984,8 @@ HTML_DYNAMIC_SECTIONS = NO
# directory and running "make install" will install the docset in
# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
GENERATE_DOCSET = NO
@@ -836,6 +1003,16 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
DOCSET_BUNDLE_ID = org.doxygen.Project
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
@@ -880,10 +1057,10 @@ BINARY_TOC = NO
TOC_EXPAND = NO
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
GENERATE_QHP = NO
@@ -905,20 +1082,24 @@ QHP_NAMESPACE =
QHP_VIRTUAL_FOLDER = doc
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
# http://doc.trolltech.com/qthelpproject.html#custom-filters
QHP_CUST_FILTER_NAME =
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
QHP_CUST_FILTER_ATTRS =
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
QHP_SECT_FILTER_ATTRS =
@@ -929,16 +1110,30 @@ QHP_SECT_FILTER_ATTRS =
QHG_LOCATION =
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
-DISABLE_INDEX = NO
+GENERATE_ECLIPSEHELP = NO
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
-ENUM_VALUES_PER_LINE = 4
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = NO
# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
# structure should be generated to display hierarchical information.
@@ -947,13 +1142,17 @@ ENUM_VALUES_PER_LINE = 4
# is generated for HTML Help). For this to work a browser that supports
# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
GENERATE_TREEVIEW = NO
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
-USE_INLINE_TREES = NO
+ENUM_VALUES_PER_LINE = 4
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
@@ -961,6 +1160,11 @@ USE_INLINE_TREES = NO
TREEVIEW_WIDTH = 250
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
# Use this tag to change the font size of Latex formulas included
# as images in the HTML documentation. The default is 10. Note that
# when you change the font size after a successful doxygen run you need
@@ -969,13 +1173,112 @@ TREEVIEW_WIDTH = 250
FORMULA_FONTSIZE = 10
-# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
+# pieces of code that will be used on startup of the MathJax code.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
SEARCHENGINE = YES
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search
+# engine library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS =
+
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
@@ -993,6 +1296,9 @@ LATEX_OUTPUT = latex
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
LATEX_CMD_NAME = latex
@@ -1009,8 +1315,8 @@ MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4 will be used.
PAPER_TYPE = a4wide
@@ -1026,6 +1332,20 @@ EXTRA_PACKAGES =
LATEX_HEADER =
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
+# or other source files which should be copied to the LaTeX output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
+
+LATEX_EXTRA_FILES =
+
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
# contain links (just like the HTML output) instead of page references
@@ -1052,10 +1372,19 @@ LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
LATEX_SOURCE_CODE = NO
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -1087,7 +1416,7 @@ COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
@@ -1162,6 +1491,21 @@ XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
+# configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
+# that can be used to generate PDF.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it. If left blank docbook will be used as the default path.
+
+DOCBOOK_OUTPUT = docbook
+
+#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
@@ -1232,7 +1576,7 @@ MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = NO
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
SEARCH_INCLUDES = YES
@@ -1262,15 +1606,15 @@ PREDEFINED =
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
SKIP_FUNCTION_MACROS = YES
@@ -1278,22 +1622,18 @@ SKIP_FUNCTION_MACROS = YES
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
#
# TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows:
#
# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
TAGFILES =
@@ -1314,6 +1654,12 @@ ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
+# in the related pages index. If set to NO, only the current project's
+# pages will be listed.
+
+EXTERNAL_PAGES = YES
+
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
@@ -1326,9 +1672,8 @@ PERL_PATH = /usr/bin/perl
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
CLASS_DIAGRAMS = YES
@@ -1354,33 +1699,38 @@ HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
-DOT_FONTNAME = FreeSans
+DOT_FONTNAME = Helvetica
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
DOT_FONTSIZE = 10
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
@@ -1402,6 +1752,15 @@ GROUP_GRAPHS = YES
UML_LOOK = NO
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# manageable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
@@ -1438,11 +1797,11 @@ CALL_GRAPH = NO
CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# will generate a graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
@@ -1450,11 +1809,22 @@ GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
DOT_IMAGE_FORMAT = png
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1466,6 +1836,12 @@ DOT_PATH =
DOTFILE_DIRS =
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index 08ff4108d3..67271ee903 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -18,6 +18,62 @@
# Boston, MA 02110-1301, USA.
########################################################################
+# Check for system libgsm....
+########################################################################
+if(NOT GR_USE_SYSTEM_LIBGSM)
+ find_path(LIBGSM_INCLUDE_DIR NAMES gsm.h
+ PATHS
+ ${LIBGSM_PKG_INCLUDE_DIRS}
+ /usr/include/gsm
+ /usr/include
+ )
+
+ find_library(LIBGSM_LIBRARIES NAMES gsm
+ PATHS
+ ${LIBGSM_PKG_LIBRARY_DIRS}
+ /usr/lib
+ )
+
+if(LIBGSM_INCLUDE_DIR AND LIBGSM_LIBRARIES)
+ set(GR_USE_SYSTEM_LIBGSM TRUE CACHE INTERNAL "system libgsm found")
+ message(STATUS "Found libgsm: ${LIBGSM_INCLUDE_DIR}, ${LIBGSM_LIBRARIES}")
+else(LIBGSM_INCLUDE_DIR AND LIBGSM_LIBRARIES)
+ set(GR_USE_SYSTEM_LIBGSM FALSE CACHE INTERNAL "system libgsm found")
+ message(STATUS "system libgsm not found.")
+endif(LIBGSM_INCLUDE_DIR AND LIBGSM_LIBRARIES)
+
+mark_as_advanced(LIBGSM_INCLUDE_DIR LIBGSM_LIBRARIES)
+endif(NOT GR_USE_SYSTEM_LIBGSM)
+
+########################################################################
+# Check for system libcodec2....
+########################################################################
+if(NOT GR_USE_SYSTEM_LIBCODEC2)
+ find_path(LIBCODEC2_INCLUDE_DIR NAMES codec2.h
+ PATHS
+ ${LIBCODEC2_PKG_INCLUDE_DIRS}
+ /usr/include/codec2
+ /usr/include
+ )
+
+ find_library(LIBCODEC2_LIBRARIES NAMES codec2
+ PATHS
+ ${LIBCODEC2_PKG_LIBRARY_DIRS}
+ /usr/lib
+ )
+
+if(LIBCODEC2_INCLUDE_DIR AND LIBCODEC2_LIBRARIES)
+ set(GR_USE_SYSTEM_LIBCODEC2 TRUE CACHE INTERNAL "system libcodec2 found")
+ message(STATUS "Found libcodec2: ${LIBCODEC2_INCLUDE_DIR}, ${LIBCODEC2_LIBRARIES}")
+else(LIBCODEC2_INCLUDE_DIR AND LIBCODEC2_LIBRARIES)
+ set(GR_USE_SYSTEM_LIBCODEC2 FALSE CACHE INTERNAL "system libcodec2 found")
+ message(STATUS "system libcodec2 not found.")
+endif(LIBCODEC2_INCLUDE_DIR AND LIBCODEC2_LIBRARIES)
+
+mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES)
+endif(NOT GR_USE_SYSTEM_LIBCODEC2)
+
+########################################################################
# Setup the include and linker paths
########################################################################
include_directories(
@@ -77,9 +133,15 @@ endif(MSVC)
########################################################################
# Include subdirs rather to populate to the sources lists.
########################################################################
-GR_INCLUDE_SUBDIRECTORY(codec2)
GR_INCLUDE_SUBDIRECTORY(g7xx)
-GR_INCLUDE_SUBDIRECTORY(gsm)
+
+if(NOT GR_USE_SYSTEM_LIBCODEC2)
+ GR_INCLUDE_SUBDIRECTORY(codec2)
+endif(NOT GR_USE_SYSTEM_LIBCODEC2)
+
+if(NOT GR_USE_SYSTEM_LIBGSM)
+ GR_INCLUDE_SUBDIRECTORY(gsm)
+endif(NOT GR_USE_SYSTEM_LIBGSM)
list(APPEND vocoder_libs
gnuradio-runtime
@@ -87,6 +149,14 @@ list(APPEND vocoder_libs
${LOG4CPP_LIBRARIES}
)
+if(GR_USE_SYSTEM_LIBCODEC2)
+ list(APPEND vocoder_libs ${LIBCODEC2_LIBRARIES})
+endif(GR_USE_SYSTEM_LIBCODEC2)
+
+if(GR_USE_SYSTEM_LIBGSM)
+ list(APPEND vocoder_libs ${LIBGSM_LIBRARIES})
+endif(GR_USE_SYSTEM_LIBGSM)
+
add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources})
target_link_libraries(gnuradio-vocoder ${vocoder_libs})
GR_LIBRARY_FOO(gnuradio-vocoder RUNTIME_COMPONENT "vocoder_runtime" DEVEL_COMPONENT "vocoder_devel")
diff --git a/grc/base/Block.py b/grc/base/Block.py
index 668675c685..5a91810b7d 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -18,11 +18,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
"""
from . import odict
+from . Constants import ADVANCED_PARAM_TAB, DEFAULT_PARAM_TAB
from Element import Element
from Cheetah.Template import Template
from UserDict import UserDict
-from .. gui import Actions
+from itertools import imap
class TemplateArg(UserDict):
"""
@@ -76,6 +77,11 @@ class Block(Element):
self._block_wrapper_path = n.find('block_wrapper_path')
self._bussify_sink = n.find('bus_sink')
self._bussify_source = n.find('bus_source')
+
+ # get list of param tabs
+ n_tabs = n.find('param_tab_order') or None
+ self._param_tab_labels = n_tabs.findall('tab') if n_tabs is not None else [DEFAULT_PARAM_TAB]
+
#create the param objects
self._params = list()
#add the id param
@@ -97,7 +103,7 @@ class Block(Element):
'hide': 'all',
})
))
- for param in map(lambda n: self.get_parent().get_parent().Param(block=self, n=n), params):
+ for param in imap(lambda n: self.get_parent().get_parent().Param(block=self, n=n), params):
key = param.get_key()
#test against repeated keys
if key in self.get_param_keys():
@@ -142,6 +148,7 @@ class Block(Element):
'key': 'affinity',
'type': 'int_vector',
'hide': 'part',
+ 'tab': ADVANCED_PARAM_TAB
})
))
if len(sources) and is_not_virtual_or_pad:
@@ -151,7 +158,8 @@ class Block(Element):
'key': 'minoutbuf',
'type': 'int',
'hide': 'part',
- 'value': '0'
+ 'value': '0',
+ 'tab': ADVANCED_PARAM_TAB
})
))
self.get_params().append(self.get_parent().get_parent().Param(
@@ -160,14 +168,14 @@ class Block(Element):
'key': 'maxoutbuf',
'type': 'int',
'hide': 'part',
- 'value': '0'
+ 'value': '0',
+ 'tab': ADVANCED_PARAM_TAB
})
))
def back_ofthe_bus(self, portlist):
portlist.sort(key=lambda a: a.get_type() == 'bus');
-
def filter_bus_port(self, ports):
buslist = [i for i in ports if i.get_type() == 'bus'];
@@ -213,6 +221,7 @@ class Block(Element):
##############################################
# Access Params
##############################################
+ def get_param_tab_labels(self): return self._param_tab_labels
def get_param_keys(self): return _get_keys(self._params)
def get_param(self, key): return _get_elem(self._params, key)
def get_params(self): return self._params
diff --git a/grc/base/Constants.py b/grc/base/Constants.py
index ef45be8dfe..e5026d9da7 100644
--- a/grc/base/Constants.py
+++ b/grc/base/Constants.py
@@ -23,3 +23,7 @@ import os
DATA_DIR = os.path.dirname(__file__)
FLOW_GRAPH_DTD = os.path.join(DATA_DIR, 'flow_graph.dtd')
BLOCK_TREE_DTD = os.path.join(DATA_DIR, 'block_tree.dtd')
+
+# Param tabs
+DEFAULT_PARAM_TAB = "General"
+ADVANCED_PARAM_TAB = "Advanced"
diff --git a/grc/base/Element.py b/grc/base/Element.py
index 17b2234a8c..be73ab264f 100644
--- a/grc/base/Element.py
+++ b/grc/base/Element.py
@@ -89,6 +89,7 @@ class Element(object):
def is_flow_graph(self): return False
def is_connection(self): return False
def is_block(self): return False
+ def is_dummy_block(self): return False
def is_source(self): return False
def is_sink(self): return False
def is_port(self): return False
diff --git a/grc/base/FlowGraph.py b/grc/base/FlowGraph.py
index c85e3ce233..3c249ff71b 100644
--- a/grc/base/FlowGraph.py
+++ b/grc/base/FlowGraph.py
@@ -268,16 +268,20 @@ class FlowGraph(Element):
#build the blocks
for block_n in blocks_n:
key = block_n.find('key')
- if key == 'options': block = self._options_block
- else: block = self.get_new_block(key)
- #only load the block when the block key was valid
- if block: block.import_data(block_n)
- else: Messages.send_error_load('Block key "%s" not found in %s'%(key, self.get_parent()))
+ block = self._options_block if key == 'options' else self.get_new_block(key)
+
+ if not block: # looks like this block key cannot be found
+ # create a dummy block instead
+ block = self.get_new_block('dummy_block')
+ # Ugly ugly ugly
+ _initialize_dummy_block(block, block_n)
+ Messages.send_error_load('Block key "%s" not found in %s' % (key, self.get_parent()))
+
+ block.import_data(block_n)
#build the connections
block_ids = map(lambda b: b.get_id(), self.get_blocks())
for connection_n in connections_n:
- #try to make the connection
- try:
+ try: # to make the connection
#get the block ids
source_block_id = connection_n.find('source_block_id')
sink_block_id = connection_n.find('sink_block_id')
@@ -297,9 +301,17 @@ class FlowGraph(Element):
sink_key = self.update_message_port_key(sink_key, sink_block.get_sinks())
#verify the ports
if source_key not in source_block.get_source_keys():
- raise LookupError('source key "%s" not in source block keys'%source_key)
+ # dummy blocks learn their ports here
+ if source_block.is_dummy_block():
+ _dummy_block_add_port(source_block, source_key, dir='source')
+ else:
+ raise LookupError('source key "%s" not in source block keys' % source_key)
if sink_key not in sink_block.get_sink_keys():
- raise LookupError('sink key "%s" not in sink block keys'%sink_key)
+ # dummy blocks learn their ports here
+ if sink_block.is_dummy_block():
+ _dummy_block_add_port(sink_block, sink_key, dir='sink')
+ else:
+ raise LookupError('sink key "%s" not in sink block keys' % sink_key)
#get the ports
source = source_block.get_source(source_key)
sink = sink_block.get_sink(sink_key)
@@ -327,7 +339,35 @@ class FlowGraph(Element):
:returns: the updated key or the original one
"""
if key.isdigit(): # don't bother current message port keys
- port = ports[int(key)] # get port (assuming liner indexed keys)
- if port.get_type() == "message":
- return port.get_key() # for message ports get updated key
- return key # do nothing \ No newline at end of file
+ try:
+ port = ports[int(key)] # get port (assuming liner indexed keys)
+ if port.get_type() == "message":
+ return port.get_key() # for message ports get updated key
+ except IndexError:
+ pass
+ return key # do nothing
+
+
+def _initialize_dummy_block(block, block_n):
+ """This is so ugly... dummy-fy a block
+
+ Modify block object to get the behaviour for a missing block
+ """
+ block._key = block_n.find('key')
+ block.is_dummy_block = lambda: True
+ block.is_valid = lambda: False
+ block.get_enabled = lambda: False
+ for param_n in block_n.findall('param'):
+ if param_n['key'] not in block.get_param_keys():
+ new_param_n = odict({'key': param_n['key'], 'name': param_n['key'], 'type': 'string'})
+ block.get_params().append(block.get_parent().get_parent().Param(block=block, n=new_param_n))
+
+
+def _dummy_block_add_port(block, key, dir):
+ """This is so ugly... Add a port to a dummy-fied block"""
+ port_n = odict({'name': '?', 'key': key, 'type': ''})
+ port = block.get_parent().get_parent().Port(block=block, n=port_n, dir=dir)
+ if port.is_source():
+ block.get_sources().append(port)
+ else:
+ block.get_sinks().append(port) \ No newline at end of file
diff --git a/grc/base/Param.py b/grc/base/Param.py
index 8b8362ac1a..33ba7c3dbb 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -68,12 +68,23 @@ class Param(Element):
block: the parent element
n: the nested odict
"""
- #grab the data
+ # if the base key is a valid param key, copy its data and overlay this params data
+ base_key = n.find('base_key')
+ if base_key and base_key in block.get_param_keys():
+ n_expanded = block.get_param(base_key)._n.copy()
+ n_expanded.update(n)
+ n = n_expanded
+ # save odict in case this param will be base for another
+ self._n = n
+ # parse the data
self._name = n.find('name')
self._key = n.find('key')
value = n.find('value') or ''
- self._type = n.find('type')
+ self._type = n.find('type') or 'raw'
self._hide = n.find('hide') or ''
+ self._tab_label = n.find('tab') or block.get_param_tab_labels()[0]
+ if not self._tab_label in block.get_param_tab_labels():
+ block.get_param_tab_labels().append(self._tab_label)
#build the param
Element.__init__(self, block)
#create the Option objects from the n data
@@ -143,6 +154,7 @@ class Param(Element):
def set_value(self, value): self._value = str(value) #must be a string
def get_type(self): return self.get_parent().resolve_dependencies(self._type)
+ def get_tab_label(self): return self._tab_label
def is_enum(self): return self._type == 'enum'
def __repr__(self):
diff --git a/grc/base/Platform.py b/grc/base/Platform.py
index 3ff80e8a03..187a50c01c 100644
--- a/grc/base/Platform.py
+++ b/grc/base/Platform.py
@@ -196,6 +196,7 @@ class Platform(_Element):
def get_license(self): return self._license
def get_website(self): return self._website
def get_colors(self): return self._colors
+ def get_block_paths(self): return self._block_paths
##############################################
# Constructors
diff --git a/grc/blocks/dummy.xml b/grc/blocks/dummy.xml
new file mode 100644
index 0000000000..c0ca3b6698
--- /dev/null
+++ b/grc/blocks/dummy.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Dummy Block
+###################################################
+-->
+<block>
+ <name>Missing Block</name>
+ <key>dummy_block</key>
+ <make>raise NotImplementedError()</make>
+</block>
diff --git a/grc/grc_gnuradio/blks2/packet.py b/grc/grc_gnuradio/blks2/packet.py
index 872f08ca2e..dde3ec722f 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/grc/grc_gnuradio/blks2/packet.py
@@ -75,9 +75,9 @@ class packet_encoder(gr.hier_block2):
Args:
samples_per_symbol: number of samples per symbol
bits_per_symbol: number of bits per symbol
+ preamble: string of ascii 0's and 1's
access_code: AKA sync vector
pad_for_usrp: If true, packets are padded such that they end up a multiple of 128 samples
- payload_length: number of bytes in a data-stream slice
"""
#setup parameters
self._samples_per_symbol = samples_per_symbol
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 86f06aad58..65969e0d6f 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -25,6 +25,7 @@ import pygtk
pygtk.require('2.0')
import gtk
import gobject
+import subprocess
import Preferences
from threading import Thread
import Messages
@@ -115,7 +116,8 @@ class ActionHandler:
Actions.FLOW_GRAPH_CLOSE, Actions.ABOUT_WINDOW_DISPLAY,
Actions.FLOW_GRAPH_SCREEN_CAPTURE, Actions.HELP_WINDOW_DISPLAY,
Actions.TYPES_WINDOW_DISPLAY, Actions.TOGGLE_BLOCKS_WINDOW,
- Actions.TOGGLE_REPORTS_WINDOW,
+ Actions.TOGGLE_REPORTS_WINDOW, Actions.TOGGLE_HIDE_DISABLED_BLOCKS,
+ Actions.TOOLS_RUN_FDESIGN,
): action.set_sensitive(True)
if ParseXML.xml_failures:
Messages.send_xml_errors_if_any(ParseXML.xml_failures)
@@ -359,12 +361,20 @@ class ActionHandler:
Dialogs.ErrorsDialog(self.get_flow_graph())
elif action == Actions.TOGGLE_REPORTS_WINDOW:
visible = action.get_active()
- self.main_window.reports_scrolled_window.set_visible(visible)
+ if visible:
+ self.main_window.reports_scrolled_window.show()
+ else:
+ self.main_window.reports_scrolled_window.hide()
Preferences.reports_window_visibility(visible)
elif action == Actions.TOGGLE_BLOCKS_WINDOW:
visible = action.get_active()
- self.main_window.btwin.set_visible(visible)
+ if visible:
+ self.main_window.btwin.show()
+ else:
+ self.main_window.btwin.hide()
Preferences.blocks_window_visibility(visible)
+ elif action == Actions.TOGGLE_HIDE_DISABLED_BLOCKS:
+ Actions.NOTHING_SELECT()
##################################################
# Param Modifications
##################################################
@@ -472,28 +482,34 @@ class ActionHandler:
elif action == Actions.FIND_BLOCKS:
self.main_window.btwin.show()
self.main_window.btwin.search_entry.show()
- self.main_window.set_focus(self.main_window.btwin.search_entry)
+ self.main_window.btwin.search_entry.grab_focus()
elif action == Actions.OPEN_HIER:
bn = [];
for b in self.get_flow_graph().get_selected_blocks():
if b._grc_source:
- self.main_window.new_page(b._grc_source, show=True);
+ self.main_window.new_page(b._grc_source, show=True)
elif action == Actions.BUSSIFY_SOURCES:
n = {'name':'bus', 'type':'bus'}
for b in self.get_flow_graph().get_selected_blocks():
- b.bussify(n, 'source');
- self.get_flow_graph()._old_selected_port = None;
- self.get_flow_graph()._new_selected_port = None;
- Actions.ELEMENT_CREATE();
+ b.bussify(n, 'source')
+ self.get_flow_graph()._old_selected_port = None
+ self.get_flow_graph()._new_selected_port = None
+ Actions.ELEMENT_CREATE()
elif action == Actions.BUSSIFY_SINKS:
n = {'name':'bus', 'type':'bus'}
for b in self.get_flow_graph().get_selected_blocks():
b.bussify(n, 'sink')
- self.get_flow_graph()._old_selected_port = None;
- self.get_flow_graph()._new_selected_port = None;
- Actions.ELEMENT_CREATE();
- else: print '!!! Action "%s" not handled !!!'%action
+ self.get_flow_graph()._old_selected_port = None
+ self.get_flow_graph()._new_selected_port = None
+ Actions.ELEMENT_CREATE()
+
+ elif action == Actions.TOOLS_RUN_FDESIGN:
+ subprocess.Popen('gr_filter_design',
+ shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
+ else:
+ print '!!! Action "%s" not handled !!!' % action
##################################################
# Global Actions for all States
##################################################
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index 284c78f8fc..f633e7ced0 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -236,6 +236,12 @@ BLOCK_DISABLE = Action(
stock_id=gtk.STOCK_DISCONNECT,
keypresses=(gtk.keysyms.d, NO_MODS_MASK),
)
+TOGGLE_HIDE_DISABLED_BLOCKS = ToggleAction(
+ label='Hide _disabled blocks',
+ tooltip='Toggle visibility of disabled blocks and connections',
+ stock_id=gtk.STOCK_MISSING_IMAGE,
+ keypresses=(gtk.keysyms.d, gtk.gdk.CONTROL_MASK),
+)
BLOCK_CREATE_HIER = Action(
label='C_reate Hier',
tooltip='Create hier block from selected blocks',
@@ -359,3 +365,11 @@ XML_PARSER_ERRORS_DISPLAY = Action(
tooltip='View errors that occured while parsing XML files',
stock_id=gtk.STOCK_DIALOG_ERROR,
)
+TOOLS_RUN_FDESIGN = Action(
+ label='Filter design tool',
+ tooltip='Execute gr_filter_design',
+ stock_id=gtk.STOCK_EXECUTE,
+)
+TOOLS_MORE_TO_COME = Action(
+ label='More to come',
+)
diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index f016209383..da1b1469e1 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -49,6 +49,7 @@ TOOLBAR_LIST = (
None,
Actions.BLOCK_ENABLE,
Actions.BLOCK_DISABLE,
+ Actions.TOGGLE_HIDE_DISABLED_BLOCKS,
None,
Actions.FIND_BLOCKS,
Actions.RELOAD_BLOCKS,
@@ -100,6 +101,11 @@ MENU_BAR_LIST = (
Actions.FLOW_GRAPH_EXEC,
Actions.FLOW_GRAPH_KILL,
]),
+ (gtk.Action('Tools', '_Tools', None, None), [
+ Actions.TOOLS_RUN_FDESIGN,
+ None,
+ Actions.TOOLS_MORE_TO_COME,
+ ]),
(gtk.Action('Help', '_Help', None, None), [
Actions.HELP_WINDOW_DISPLAY,
Actions.TYPES_WINDOW_DISPLAY,
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 30031866c0..b2b391246e 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -131,7 +131,8 @@ class Block(Element):
def create_labels(self):
"""Create the labels for the signal block."""
Element.create_labels(self)
- self._bg_color = self.get_enabled() and Colors.BLOCK_ENABLED_COLOR or Colors.BLOCK_DISABLED_COLOR
+ self._bg_color = self.is_dummy_block() and Colors.MISSING_BLOCK_BACKGROUND_COLOR or \
+ self.get_enabled() and Colors.BLOCK_ENABLED_COLOR or Colors.BLOCK_DISABLED_COLOR
layouts = list()
#create the main layout
layout = gtk.DrawingArea().create_pango_layout('')
@@ -139,7 +140,10 @@ class Block(Element):
layout.set_markup(Utils.parse_template(BLOCK_MARKUP_TMPL, block=self))
self.label_width, self.label_height = layout.get_pixel_size()
#display the params
- markups = [param.get_markup() for param in self.get_params() if param.get_hide() not in ('all', 'part')]
+ if self.is_dummy_block():
+ markups = ['<span foreground="black" font_desc="Sans 7.5"><b>key: </b>{}</span>'.format(self._key)]
+ else:
+ markups = [param.get_markup() for param in self.get_params() if param.get_hide() not in ('all', 'part')]
if markups:
layout = gtk.DrawingArea().create_pango_layout('')
layout.set_spacing(LABEL_SEPARATION*pango.SCALE)
@@ -191,7 +195,8 @@ class Block(Element):
#draw main block
Element.draw(
self, gc, window, bg_color=self._bg_color,
- border_color=self.is_highlighted() and Colors.HIGHLIGHT_COLOR or Colors.BORDER_COLOR,
+ border_color=self.is_highlighted() and Colors.HIGHLIGHT_COLOR or
+ self.is_dummy_block() and Colors.MISSING_BLOCK_BORDER_COLOR or Colors.BORDER_COLOR,
)
#draw label image
if self.is_horizontal():
diff --git a/grc/gui/Colors.py b/grc/gui/Colors.py
index 5f92bb07a9..541d8db0b2 100644
--- a/grc/gui/Colors.py
+++ b/grc/gui/Colors.py
@@ -26,6 +26,9 @@ try:
HIGHLIGHT_COLOR = get_color('#00FFFF')
BORDER_COLOR = get_color('black')
+ # missing blocks stuff
+ MISSING_BLOCK_BACKGROUND_COLOR = get_color('#FFF2F2')
+ MISSING_BLOCK_BORDER_COLOR = get_color('red')
#param entry boxes
PARAM_ENTRY_TEXT_COLOR = get_color('black')
ENTRYENUM_CUSTOM_COLOR = get_color('#EEEEEE')
diff --git a/grc/gui/DrawingArea.py b/grc/gui/DrawingArea.py
index 9fac791284..05e69e7bc6 100644
--- a/grc/gui/DrawingArea.py
+++ b/grc/gui/DrawingArea.py
@@ -63,7 +63,7 @@ class DrawingArea(gtk.DrawingArea):
def _handle_notify_event(widget, event, focus_flag): self._focus_flag = focus_flag
self.connect('leave-notify-event', _handle_notify_event, False)
self.connect('enter-notify-event', _handle_notify_event, True)
- self.set_can_focus(True)
+ self.set_flags(gtk.CAN_FOCUS) # self.set_can_focus(True)
self.connect('focus-out-event', self._handle_focus_lost_event)
def new_pixmap(self, width, height): return gtk.gdk.Pixmap(self.window, width, height, -1)
@@ -140,7 +140,7 @@ class DrawingArea(gtk.DrawingArea):
def _handle_focus_lost_event(self, widget, event):
# don't clear selection while context menu is active
- if self._flow_graph.get_context_menu().get_visible(): return
- self._flow_graph.unselect()
- self._flow_graph.update_selected()
- self._flow_graph.queue_draw()
+ if not self._flow_graph.get_context_menu().flags() & gtk.VISIBLE:
+ self._flow_graph.unselect()
+ self._flow_graph.update_selected()
+ self._flow_graph.queue_draw()
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py
index c194dfb113..1103aa1639 100644
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@ -37,7 +37,7 @@ class FlowGraph(Element):
def __init__(self):
"""
- FlowGraph contructor.
+ FlowGraph constructor.
Create a list for signal blocks and connections. Connect mouse handlers.
"""
Element.__init__(self)
@@ -309,6 +309,8 @@ class FlowGraph(Element):
window.draw_rectangle(gc, False, x, y, w, h)
#draw blocks on top of connections
for element in self.get_connections() + self.get_blocks():
+ if Actions.TOGGLE_HIDE_DISABLED_BLOCKS.get_active() and not element.get_enabled():
+ continue # skip hidden disabled blocks and connections
element.draw(gc, window)
#draw selected blocks on top of selected connections
for selected_element in self.get_selected_connections() + self.get_selected_blocks():
@@ -374,6 +376,13 @@ class FlowGraph(Element):
for element in reversed(self.get_elements()):
selected_element = element.what_is_selected(coor, coor_m)
if not selected_element: continue
+ # hidden disabled connections, blocks and their ports can not be selected
+ if Actions.TOGGLE_HIDE_DISABLED_BLOCKS.get_active() and (
+ selected_element.is_block() and not selected_element.get_enabled() or
+ selected_element.is_connection() and not selected_element.get_enabled() or
+ selected_element.is_port() and not selected_element.get_parent().get_enabled()
+ ):
+ continue
#update the selected port information
if selected_element.is_port():
if not coor_m: selected_port = selected_element
diff --git a/grc/gui/Messages.py b/grc/gui/Messages.py
index c4706459af..2bf488bb58 100644
--- a/grc/gui/Messages.py
+++ b/grc/gui/Messages.py
@@ -48,7 +48,16 @@ register_messenger(sys.stdout.write)
# Special functions for specific program functionalities
###########################################################################
def send_init(platform):
- send("""<<< Welcome to %s %s >>>\n"""%(platform.get_name(), platform.get_version()))
+ p = platform
+ send('\n'.join([
+ "<<< Welcome to %s %s >>>" % (p.get_name(), p.get_version()),
+ "",
+ "Preferences file: " + p.get_prefs_file(),
+ "Block paths:"
+ ] + [
+ "\t%s" % path + (" (%s)" % opath if opath != path else "")
+ for path, opath in p.get_block_paths().iteritems()
+ ]) + "\n")
def send_page_switch(file_path):
send('\nShowing: "%s"\n'%file_path)
diff --git a/grc/gui/Param.py b/grc/gui/Param.py
index f0e5a2fcb2..2ca20fab2a 100644
--- a/grc/gui/Param.py
+++ b/grc/gui/Param.py
@@ -23,6 +23,7 @@ import pygtk
pygtk.require('2.0')
import gtk
import Colors
+import os
class InputParam(gtk.HBox):
"""The base class for an input parameter inside the input parameters dialog."""
@@ -36,6 +37,7 @@ class InputParam(gtk.HBox):
self.pack_start(self.label, False)
self.set_markup = lambda m: self.label.set_markup(m)
self.tp = None
+ self._changed_but_unchecked = False
#connect events
self.connect('show', self._update_gui)
def set_color(self, color): pass
@@ -49,7 +51,9 @@ class InputParam(gtk.HBox):
has_cb = \
hasattr(self.param.get_parent(), 'get_callbacks') and \
filter(lambda c: self.param.get_key() in c, self.param.get_parent()._callbacks)
- self.set_markup(Utils.parse_template(PARAM_LABEL_MARKUP_TMPL, param=self.param, has_cb=has_cb))
+ self.set_markup(Utils.parse_template(PARAM_LABEL_MARKUP_TMPL,
+ param=self.param, has_cb=has_cb,
+ modified=self._changed_but_unchecked))
#set the color
self.set_color(self.param.get_color())
#set the tooltip
@@ -60,7 +64,14 @@ class InputParam(gtk.HBox):
if self.param.get_hide() == 'all': self.hide_all()
else: self.show_all()
- def _handle_changed(self, *args):
+ def _mark_changed(self, *args):
+ """
+ Mark this param as modified on change, but validate only on focus-lost
+ """
+ self._changed_but_unchecked = True
+ self._update_gui()
+
+ def _apply_change(self, *args):
"""
Handle a gui change by setting the new param value,
calling the callback (if applicable), and updating.
@@ -71,6 +82,7 @@ class InputParam(gtk.HBox):
if self._callback: self._callback(*args)
else: self.param.validate()
#gui update
+ self._changed_but_unchecked = False
self._update_gui()
class EntryParam(InputParam):
@@ -80,7 +92,8 @@ class EntryParam(InputParam):
InputParam.__init__(self, *args, **kwargs)
self._input = gtk.Entry()
self._input.set_text(self.param.get_value())
- self._input.connect('changed', self._handle_changed)
+ self._input.connect('changed', self._mark_changed)
+ self._input.connect('focus-out-event', self._apply_change)
self.pack_start(self._input, True)
def get_text(self): return self._input.get_text()
def set_color(self, color):
@@ -96,7 +109,7 @@ class EnumParam(InputParam):
self._input = gtk.combo_box_new_text()
for option in self.param.get_options(): self._input.append_text(option.get_name())
self._input.set_active(self.param.get_option_keys().index(self.param.get_value()))
- self._input.connect('changed', self._handle_changed)
+ self._input.connect('changed', self._apply_change)
self.pack_start(self._input, False)
def get_text(self): return self.param.get_option_keys()[self._input.get_active()]
def set_tooltip_text(self, text): self._input.set_tooltip_text(text)
@@ -112,8 +125,9 @@ class EnumEntryParam(InputParam):
except:
self._input.set_active(-1)
self._input.get_child().set_text(self.param.get_value())
- self._input.connect('changed', self._handle_changed)
- self._input.get_child().connect('changed', self._handle_changed)
+ self._input.connect('changed', self._apply_change)
+ self._input.get_child().connect('changed', self._mark_changed)
+ self._input.get_child().connect('focus-out-event', self._apply_change)
self.pack_start(self._input, False)
def get_text(self):
if self._input.get_active() == -1: return self._input.get_child().get_text()
@@ -130,12 +144,50 @@ class EnumEntryParam(InputParam):
self._input.get_child().modify_base(gtk.STATE_NORMAL, Colors.ENTRYENUM_CUSTOM_COLOR)
self._input.get_child().modify_text(gtk.STATE_NORMAL, Colors.PARAM_ENTRY_TEXT_COLOR)
+
+class FileParam(EntryParam):
+ """Provide an entry box for filename and a button to browse for a file."""
+
+ def __init__(self, *args, **kwargs):
+ EntryParam.__init__(self, *args, **kwargs)
+ input = gtk.Button('...')
+ input.connect('clicked', self._handle_clicked)
+ self.pack_start(input, False)
+
+ def _handle_clicked(self, widget=None):
+ """
+ If the button was clicked, open a file dialog in open/save format.
+ Replace the text in the entry with the new filename from the file dialog.
+ """
+ #get the paths
+ file_path = self.param.is_valid() and self.param.get_evaluated() or ''
+ (dirname, basename) = os.path.isfile(file_path) and os.path.split(file_path) or (file_path, '')
+ if not os.path.exists(dirname): dirname = os.getcwd() #fix bad paths
+ #build the dialog
+ if self.param.get_type() == 'file_open':
+ file_dialog = gtk.FileChooserDialog('Open a Data File...', None,
+ gtk.FILE_CHOOSER_ACTION_OPEN, ('gtk-cancel',gtk.RESPONSE_CANCEL,'gtk-open',gtk.RESPONSE_OK))
+ elif self.param.get_type() == 'file_save':
+ file_dialog = gtk.FileChooserDialog('Save a Data File...', None,
+ gtk.FILE_CHOOSER_ACTION_SAVE, ('gtk-cancel',gtk.RESPONSE_CANCEL, 'gtk-save',gtk.RESPONSE_OK))
+ file_dialog.set_do_overwrite_confirmation(True)
+ file_dialog.set_current_name(basename) #show the current filename
+ file_dialog.set_current_folder(dirname) #current directory
+ file_dialog.set_select_multiple(False)
+ file_dialog.set_local_only(True)
+ if gtk.RESPONSE_OK == file_dialog.run(): #run the dialog
+ file_path = file_dialog.get_filename() #get the file path
+ self._input.set_text(file_path)
+ self._apply_change()
+ file_dialog.destroy() #destroy the dialog
+
+
PARAM_MARKUP_TMPL="""\
#set $foreground = $param.is_valid() and 'black' or 'red'
<span foreground="$foreground" font_desc="Sans 7.5"><b>$encode($param.get_name()): </b>$encode(repr($param))</span>"""
PARAM_LABEL_MARKUP_TMPL="""\
-#set $foreground = $param.is_valid() and 'black' or 'red'
+#set $foreground = $modified and 'blue' or $param.is_valid() and 'black' or 'red'
#set $underline = $has_cb and 'low' or 'none'
<span underline="$underline" foreground="$foreground" font_desc="Sans 9">$encode($param.get_name())</span>"""
@@ -179,8 +231,15 @@ class Param(Element):
Returns:
gtk input class
"""
- if self.is_enum(): return EnumParam(self, *args, **kwargs)
- if self.get_options(): return EnumEntryParam(self, *args, **kwargs)
+ if self.get_type() in ('file_open', 'file_save'):
+ return FileParam(self, *args, **kwargs)
+
+ elif self.is_enum():
+ return EnumParam(self, *args, **kwargs)
+
+ elif self.get_options():
+ return EnumEntryParam(self, *args, **kwargs)
+
return EntryParam(self, *args, **kwargs)
def get_markup(self):
diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index 6a8175b9fa..db77ff2112 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -20,4 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
from Element import Element
class Platform(Element):
- def __init__(self): Element.__init__(self)
+ def __init__(self, prefs_file):
+ Element.__init__(self)
+
+ self._prefs_file = prefs_file
+
+ def get_prefs_file(self): return self._prefs_file \ No newline at end of file
diff --git a/grc/gui/Port.py b/grc/gui/Port.py
index fe1dc5070a..e542797ea6 100644
--- a/grc/gui/Port.py
+++ b/grc/gui/Port.py
@@ -126,7 +126,8 @@ class Port(Element):
"""
Element.draw(
self, gc, window, bg_color=self._bg_color,
- border_color=self.is_highlighted() and Colors.HIGHLIGHT_COLOR or Colors.BORDER_COLOR,
+ border_color=self.is_highlighted() and Colors.HIGHLIGHT_COLOR or
+ self.get_parent().is_dummy_block() and Colors.MISSING_BLOCK_BORDER_COLOR or Colors.BORDER_COLOR,
)
X,Y = self.get_coordinate()
(x,y),(w,h) = self._areas_list[0] #use the first area's sizes to place the labels
diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py
index c315436cae..b15fb9738b 100644
--- a/grc/gui/Preferences.py
+++ b/grc/gui/Preferences.py
@@ -24,7 +24,6 @@ _platform = None
_config_parser = ConfigParser.ConfigParser()
def file_extension(): return '.'+_platform.get_key()
-def _prefs_file(): return os.path.join(os.path.expanduser('~'), file_extension())
def load(platform):
global _platform
@@ -32,10 +31,10 @@ def load(platform):
#create sections
_config_parser.add_section('main')
_config_parser.add_section('files_open')
- try: _config_parser.read(_prefs_file())
+ try: _config_parser.read(_platform.get_prefs_file())
except: pass
def save():
- try: _config_parser.write(open(_prefs_file(), 'w'))
+ try: _config_parser.write(open(_platform.get_prefs_file(), 'w'))
except: pass
###########################################################################
diff --git a/grc/gui/PropsDialog.py b/grc/gui/PropsDialog.py
index 5c09f7cac1..05e997b3e3 100644
--- a/grc/gui/PropsDialog.py
+++ b/grc/gui/PropsDialog.py
@@ -23,6 +23,12 @@ import gtk
from Dialogs import TextDisplay
from Constants import MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT
+import Utils
+
+TAB_LABEL_MARKUP_TMPL="""\
+#set $foreground = $valid and 'black' or 'red'
+<span foreground="$foreground">$encode($tab)</span>"""
+
def get_title_label(title):
"""
@@ -41,6 +47,7 @@ def get_title_label(title):
hbox.pack_start(label, False, False, padding=11)
return hbox
+
class PropsDialog(gtk.Dialog):
"""
A dialog to set block parameters, view errors, and view documentation.
@@ -48,57 +55,68 @@ class PropsDialog(gtk.Dialog):
def __init__(self, block):
"""
- Properties dialog contructor.
+ Properties dialog constructor.
Args:
block: a block instance
"""
self._hash = 0
- LABEL_SPACING = 7
- gtk.Dialog.__init__(self,
- title='Properties: %s'%block.get_name(),
+
+ gtk.Dialog.__init__(
+ self,
+ title='Properties: %s' % block.get_name(),
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT),
)
self._block = block
self.set_size_request(MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT)
- vbox = gtk.VBox()
- #Create the scrolled window to hold all the parameters
- scrolled_window = gtk.ScrolledWindow()
- scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- scrolled_window.add_with_viewport(vbox)
- self.vbox.pack_start(scrolled_window, True)
- #Params box for block parameters
- self._params_box = gtk.VBox()
- self._params_box.pack_start(get_title_label('Parameters'), False)
- self._input_object_params = list()
- #Error Messages for the block
- self._error_box = gtk.VBox()
- self._error_messages_text_display = TextDisplay()
- self._error_box.pack_start(gtk.Label(), False, False, LABEL_SPACING)
- self._error_box.pack_start(get_title_label('Error Messages'), False)
- self._error_box.pack_start(self._error_messages_text_display, False)
- #Docs for the block
- self._docs_box = err_box = gtk.VBox()
+
+ vpaned = gtk.VPaned()
+ self.vbox.pack_start(vpaned)
+
+ # Notebook to hold param boxes
+ notebook = gtk.Notebook()
+ notebook.set_show_border(False)
+ notebook.set_scrollable(True) # scroll arrows for page tabs
+ notebook.set_tab_pos(gtk.POS_TOP)
+ vpaned.pack1(notebook, True)
+
+ # Params boxes for block parameters
+ self._params_boxes = list()
+ for tab in block.get_param_tab_labels():
+ label = gtk.Label()
+ vbox = gtk.VBox()
+ scroll_box = gtk.ScrolledWindow()
+ scroll_box.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ scroll_box.add_with_viewport(vbox)
+ notebook.append_page(scroll_box, label)
+ self._params_boxes.append((tab, label, vbox))
+
+ # Docs for the block
self._docs_text_display = TextDisplay()
- self._docs_box.pack_start(gtk.Label(), False, False, LABEL_SPACING)
- self._docs_box.pack_start(get_title_label('Documentation'), False)
- self._docs_box.pack_start(self._docs_text_display, False)
- #Add the boxes
- vbox.pack_start(self._params_box, False)
- vbox.pack_start(self._error_box, False)
- vbox.pack_start(self._docs_box, False)
- #connect events
+ self._docs_box = gtk.ScrolledWindow()
+ self._docs_box.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ self._docs_box.add_with_viewport(self._docs_text_display)
+ notebook.append_page(self._docs_box, gtk.Label("Documentation"))
+
+ # Error Messages for the block
+ self._error_messages_text_display = TextDisplay()
+ self._error_box = gtk.ScrolledWindow()
+ self._error_box.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ self._error_box.add_with_viewport(self._error_messages_text_display)
+ vpaned.pack2(self._error_box)
+ vpaned.set_position(int(0.65 * MIN_DIALOG_HEIGHT))
+
+ # Connect events
self.connect('key-press-event', self._handle_key_press)
self.connect('show', self._update_gui)
- #show all (performs initial gui update)
- self.show_all()
+ self.show_all() # show all (performs initial gui update)
def _params_changed(self):
"""
Have the params in this dialog changed?
Ex: Added, removed, type change, hide change...
To the props dialog, the hide setting of 'none' and 'part' are identical.
- Therfore, the props dialog only cares if the hide setting is/not 'all'.
+ Therefore, the props dialog only cares if the hide setting is/not 'all'.
Make a hash that uniquely represents the params' state.
Returns:
@@ -113,7 +131,7 @@ class PropsDialog(gtk.Dialog):
def _handle_changed(self, *args):
"""
- A change occured within a param:
+ A change occurred within a param:
Rewrite/validate the block and update the gui.
"""
#update for the block
@@ -123,7 +141,7 @@ class PropsDialog(gtk.Dialog):
def _update_gui(self, *args):
"""
- Repopulate the parameters box (if changed).
+ Repopulate the parameters boxes (if changed).
Update all the input parameters.
Update the error messages box.
Hide the box if there are no errors.
@@ -133,28 +151,28 @@ class PropsDialog(gtk.Dialog):
#update the params box
if self._params_changed():
#hide params box before changing
- self._params_box.hide_all()
- #empty the params box
- for io_param in list(self._input_object_params):
- self._params_box.remove(io_param)
- self._input_object_params.remove(io_param)
- io_param.destroy()
- #repopulate the params box
- for param in self._block.get_params():
- if param.get_hide() == 'all': continue
- io_param = param.get_input(self._handle_changed)
- self._input_object_params.append(io_param)
- self._params_box.pack_start(io_param, False)
- #show params box with new params
- self._params_box.show_all()
+ for tab, label, vbox in self._params_boxes:
+ vbox.hide_all()
+ # empty the params box
+ vbox.forall(lambda c: vbox.remove(c) or c.destroy())
+ # repopulate the params box
+ box_all_valid = True
+ for param in filter(lambda p: p.get_tab_label() == tab, self._block.get_params()):
+ if param.get_hide() == 'all':
+ continue
+ box_all_valid = box_all_valid and param.is_valid()
+ vbox.pack_start(param.get_input(self._handle_changed), False)
+ label.set_markup(Utils.parse_template(TAB_LABEL_MARKUP_TMPL, valid=box_all_valid, tab=tab))
+ #show params box with new params
+ vbox.show_all()
#update the errors box
- if self._block.is_valid(): self._error_box.hide()
- else: self._error_box.show()
+ if self._block.is_valid():
+ self._error_box.hide()
+ else:
+ self._error_box.show()
messages = '\n\n'.join(self._block.get_error_messages())
self._error_messages_text_display.set_text(messages)
#update the docs box
- if self._block.get_doc(): self._docs_box.show()
- else: self._docs_box.hide()
self._docs_text_display.set_text(self._block.get_doc())
def _handle_key_press(self, widget, event):
@@ -167,8 +185,8 @@ class PropsDialog(gtk.Dialog):
"""
if event.keyval == gtk.keysyms.Return:
self.response(gtk.RESPONSE_ACCEPT)
- return True #handled here
- return False #forward the keypress
+ return True # handled here
+ return False # forward the keypress
def run(self):
"""
diff --git a/grc/python/Constants.py b/grc/python/Constants.py
index 0e974df43c..79ff8bab35 100644
--- a/grc/python/Constants.py
+++ b/grc/python/Constants.py
@@ -25,7 +25,10 @@ _gr_prefs = gr.prefs()
#setup paths
PATH_SEP = {'/':':', '\\':';'}[os.path.sep]
-HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
+HIER_BLOCKS_LIB_DIR = os.environ.get('GRC_HIER_PATH',
+ os.path.expanduser('~/.grc_gnuradio'))
+PREFS_FILE = os.environ.get('GRC_PREFS_PATH',
+ os.path.join(os.path.expanduser('~/.grc')))
BLOCKS_DIRS = filter( #filter blank strings
lambda x: x, PATH_SEP.join([
os.environ.get('GRC_BLOCKS_PATH', ''),
diff --git a/grc/python/Param.py b/grc/python/Param.py
index 3daa37f637..3d9e52e25f 100644
--- a/grc/python/Param.py
+++ b/grc/python/Param.py
@@ -19,13 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
from .. base.Param import Param as _Param
from .. gui.Param import Param as _GUIParam
-from .. gui.Param import EntryParam
import Constants
import numpy
-import os
-import pygtk
-pygtk.require('2.0')
-import gtk
from gnuradio import eng_notation
import re
from gnuradio import gr
@@ -33,41 +28,6 @@ from gnuradio import gr
_check_id_matcher = re.compile('^[a-z|A-Z]\w*$')
_show_id_matcher = re.compile('^(variable\w*|parameter|options|notebook)$')
-class FileParam(EntryParam):
- """Provide an entry box for filename and a button to browse for a file."""
-
- def __init__(self, *args, **kwargs):
- EntryParam.__init__(self, *args, **kwargs)
- input = gtk.Button('...')
- input.connect('clicked', self._handle_clicked)
- self.pack_start(input, False)
-
- def _handle_clicked(self, widget=None):
- """
- If the button was clicked, open a file dialog in open/save format.
- Replace the text in the entry with the new filename from the file dialog.
- """
- #get the paths
- file_path = self.param.is_valid() and self.param.get_evaluated() or ''
- (dirname, basename) = os.path.isfile(file_path) and os.path.split(file_path) or (file_path, '')
- if not os.path.exists(dirname): dirname = os.getcwd() #fix bad paths
- #build the dialog
- if self.param.get_type() == 'file_open':
- file_dialog = gtk.FileChooserDialog('Open a Data File...', None,
- gtk.FILE_CHOOSER_ACTION_OPEN, ('gtk-cancel',gtk.RESPONSE_CANCEL,'gtk-open',gtk.RESPONSE_OK))
- elif self.param.get_type() == 'file_save':
- file_dialog = gtk.FileChooserDialog('Save a Data File...', None,
- gtk.FILE_CHOOSER_ACTION_SAVE, ('gtk-cancel',gtk.RESPONSE_CANCEL, 'gtk-save',gtk.RESPONSE_OK))
- file_dialog.set_do_overwrite_confirmation(True)
- file_dialog.set_current_name(basename) #show the current filename
- file_dialog.set_current_folder(dirname) #current directory
- file_dialog.set_select_multiple(False)
- file_dialog.set_local_only(True)
- if gtk.RESPONSE_OK == file_dialog.run(): #run the dialog
- file_path = file_dialog.get_filename() #get the file path
- self._input.set_text(file_path)
- self._handle_changed()
- file_dialog.destroy() #destroy the dialog
#blacklist certain ids, its not complete, but should help
import __builtin__
@@ -162,10 +122,6 @@ class Param(_Param, _GUIParam):
##################################################
return _truncate(dt_str, truncate)
- def get_input(self, *args, **kwargs):
- if self.get_type() in ('file_open', 'file_save'): return FileParam(self, *args, **kwargs)
- return _GUIParam.get_input(self, *args, **kwargs)
-
def get_color(self):
"""
Get the color that represents this param's type.
diff --git a/grc/python/Platform.py b/grc/python/Platform.py
index f6adaf47a5..f4f55e9d16 100644
--- a/grc/python/Platform.py
+++ b/grc/python/Platform.py
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
"""
import os
+from collections import OrderedDict
from gnuradio import gr
from .. base.Platform import Platform as _Platform
from .. gui.Platform import Platform as _GUIPlatform
@@ -29,7 +30,7 @@ from Param import Param as _Param
from Generator import Generator
from Constants import \
HIER_BLOCKS_LIB_DIR, BLOCK_DTD, \
- DEFAULT_FLOW_GRAPH, BLOCKS_DIRS
+ DEFAULT_FLOW_GRAPH, BLOCKS_DIRS, PREFS_FILE
import Constants
COLORS = [(name, color) for name, key, sizeof, color in Constants.CORE_TYPES]
@@ -42,8 +43,10 @@ class Platform(_Platform, _GUIPlatform):
"""
#ensure hier dir
if not os.path.exists(HIER_BLOCKS_LIB_DIR): os.mkdir(HIER_BLOCKS_LIB_DIR)
- #convert block paths to absolute paths
- block_paths = set(map(os.path.abspath, BLOCKS_DIRS))
+ # Convert block paths to absolute paths:
+ # - Create a mapping from the absolute path to what was passed in
+ # - Keep each unique absolute path and maintain order
+ block_paths = OrderedDict(map(lambda x: (os.path.abspath(x), x), BLOCKS_DIRS))
#init
_Platform.__init__(
self,
@@ -58,7 +61,11 @@ class Platform(_Platform, _GUIPlatform):
generator=Generator,
colors=COLORS,
)
- _GUIPlatform.__init__(self)
+
+ _GUIPlatform.__init__(
+ self,
+ prefs_file=PREFS_FILE
+ )
##############################################
# Constructors
diff --git a/grc/python/block.dtd b/grc/python/block.dtd
index 21ffbe09af..18e53fda2a 100644
--- a/grc/python/block.dtd
+++ b/grc/python/block.dtd
@@ -25,11 +25,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Top level element.
A block contains a name, ...parameters list, and list of IO ports.
-->
-<!ELEMENT block (name, key, category?, throttle?, import*, var_make?, make, callback*, param*, bus_sink?, bus_source?, check*, sink*, source*, bus_structure_sink?, bus_structure_source?, doc?, grc_source?)>
+<!ELEMENT block (name, key, category?, throttle?, import*, var_make?, make, callback*, param_tab_order?, param*, bus_sink?, bus_source?, check*, sink*, source*, bus_structure_sink?, bus_structure_source?, doc?, grc_source?)>
<!--
Sub level elements.
-->
-<!ELEMENT param (name, key, value?, type, hide?, option*)>
+<!ELEMENT param_tab_order (tab+)>
+<!ELEMENT param (base_key?, name, key, value?, type?, hide?, option*, tab?)>
<!ELEMENT option (name, key, opt*)>
<!ELEMENT sink (name, type, vlen?, nports?, optional?)>
<!ELEMENT source (name, type, vlen?, nports?, optional?)>
@@ -41,7 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<!ELEMENT import (#PCDATA)>
<!ELEMENT doc (#PCDATA)>
<!ELEMENT grc_source (#PCDATA)>
+<!ELEMENT tab (#PCDATA)>
<!ELEMENT name (#PCDATA)>
+<!ELEMENT base_key (#PCDATA)>
<!ELEMENT key (#PCDATA)>
<!ELEMENT check (#PCDATA)>
<!ELEMENT bus_sink (#PCDATA)>
diff --git a/volk/lib/qa_utils.cc b/volk/lib/qa_utils.cc
index 8007fe75a6..f30f0097ae 100644
--- a/volk/lib/qa_utils.cc
+++ b/volk/lib/qa_utils.cc
@@ -14,6 +14,7 @@
#include <volk/volk.h>
#include <volk/volk_cpu.h>
#include <volk/volk_common.h>
+#include <volk/volk_malloc.h>
#include <boost/typeof/typeof.hpp>
#include <boost/type_traits.hpp>
#include <stdio.h>
@@ -171,7 +172,7 @@ static void get_signatures_from_name(std::vector<volk_type_t> &inputsig,
}
//we don't need an output signature (some fn's operate on the input data, "in place"), but we do need at least one input!
assert(inputsig.size() != 0);
-
+
}
inline void run_cast_test1(volk_fn_1arg func, std::vector<void *> &buffs, unsigned int vlen, unsigned int iter, std::string arch) {
@@ -232,8 +233,8 @@ bool fcompare(t *in1, t *in2, unsigned int vlen, float tol) {
bool fail = false;
int print_max_errs = 10;
for(unsigned int i=0; i<vlen; i++) {
- // for very small numbers we'll see round off errors due to limited
- // precision. So a special test case...
+ // for very small numbers we'll see round off errors due to limited
+ // precision. So a special test case...
if(fabs(((t *)(in1))[i]) < 1e-30) {
if( fabs( ((t *)(in2))[i] ) > tol )
{
@@ -264,8 +265,8 @@ bool ccompare(t *in1, t *in2, unsigned int vlen, float tol) {
t err = std::sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
t norm = std::sqrt(in1[i] * in1[i] + in1[i+1] * in1[i+1]);
- // for very small numbers we'll see round off errors due to limited
- // precision. So a special test case...
+ // for very small numbers we'll see round off errors due to limited
+ // precision. So a special test case...
if (norm < 1e-30) {
if (err > tol)
{
@@ -307,11 +308,17 @@ class volk_qa_aligned_mem_pool{
public:
void *get_new(size_t size){
size_t alignment = volk_get_alignment();
- _mems.push_back(std::vector<char>(size + alignment-1, 0));
- size_t ptr = size_t(&_mems.back().front());
- return (void *)((ptr + alignment-1) & ~(alignment-1));
+ void* ptr = volk_malloc(size, alignment);
+ memset(ptr, 0x00, size);
+ _mems.push_back(ptr);
+ return ptr;
+ }
+ ~volk_qa_aligned_mem_pool() {
+ for(unsigned int ii = 0; ii < _mems.size(); ++ii) {
+ volk_free(_mems[ii]);
+ }
}
-private: std::list<std::vector<char> > _mems;
+private: std::vector<void * > _mems;
};
bool run_volk_tests(volk_func_desc_t desc,
@@ -337,7 +344,7 @@ bool run_volk_tests(volk_func_desc_t desc,
// The bug is the casting/assignment below do not happen, which results in false
// positives when testing for errors in fcompare and icompare.
// Since this only happens on armhf (reported for Cortex A9 and A15) combined with
- // the following fixes it is suspected to be a compiler bug.
+ // the following fixes it is suspected to be a compiler bug.
// Bug 1272024 on launchpad has been filed with Linaro GCC.
const float tol_f = tol*1.0000001;
const unsigned int tol_i = static_cast<const unsigned int>(tol);
@@ -357,7 +364,7 @@ bool run_volk_tests(volk_func_desc_t desc,
//now we have to get a function signature by parsing the name
std::vector<volk_type_t> inputsig, outputsig;
get_signatures_from_name(inputsig, outputsig, name);
-
+
//pull the input scalars into their own vector
std::vector<volk_type_t> inputsc;
for(size_t i=0; i<inputsig.size(); i++) {