Merge branch 'maint'
qtgui: init FFT Size box for QTGUI sink to the right FFT value. Issue #542.
docs: updating Doxygen categories for all blocks.
Block categories in Doxygen now match where they are in GRC's category tree.
grc: removed 'old' grc keys from block_tree.
This does not remove the actual GRC files, just how we find them in the block tree structure of GRC.
Renames all blocks not updated to 3.7 style as "(old)" in name.
log: replacing log4cxx with log4cpp.
Added Windows DLL resource files
Merge branch 'master' into gr_log
Conflicts: cmake/Modules/GrMiscUtils.cmake docs/doxygen/other/main_page.dox gnuradio-core/gnuradio-core.conf.in gnuradio-core/src/lib/swig/CMakeLists.txt gr-digital/lib/CMakeLists.txt gr-howto-write-a-block/CMakeLists.txt...
GrUseQt4 -> GrSetupQt4, since that's what it really does.
Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio).
build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have been the cause of the parallel build woes.
qtgui: adds parameter in qtgui sink's GRC block to set the update rate.
gr: same change for common PYTHON test paths
Conflicts:
gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt
gr: set a common GR_TEST_TARGET_DEPS for all module unit tests
Each unit test shares common dependencies,but we have been neglecting to set these.
In this changeset, we set one top level GR_TEST_TARGET_DEPS,and simply append module-specific dependencies for each test....
gr: added python -B everywhere for clean source tree
qtgui: fixed qtgui time sink to take the bandwidth parameter to set x-axis correctly.
Conflicts: CMakeLists.txt cmake/Modules/GrMiscUtils.cmake docs/doxygen/other/build_guide.dox gnuradio-core/CMakeLists.txt gr-digital/lib/CMakeLists.txt
swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds
I have not encountered an issue, however this is the correct thing to do.Now individual components swig builds depend on the gr core swig target.
gr-filter/swig/CMakeLists.txt
Fixing up the gr-log capabilities.
Better handling of enable/disable function, easier integration with all components if log4cxx is or is not there. All components have been updated to be able to use logging. Docs update, too.
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Merge branch 'rm_python_ext' into cmake_builds
Conflicts: CMakeLists.txt
examples: Reworked locations and installation of examples.
All python and GRC examples directly associated with a top-level component are now in that examples directory. Examples are split into c++, python, and grc dirs but are all installed into $prefix/share/gnuradio/examples/<component>.
Removes all references to guile and scheme, which are no longer needed.
The remaining pmt_serial_tags.scm is parsed by Python already. Future modifications could change this format to not confuse the point.
Merge branch 'master' into next
volk: added volk as depedency for various components
Its important to list the dependent libraries for a test so the library path can be correctly set. This is necessary on platforms without dynamic re-linking.
uhd: fixes to instantiating UHD devices to set the antenna and subdevice properly (patch from Sam Bretheim).
qtgui: include QT_USE_FILE only when enabled
Removed autotools, gr-waveform, some cleanup
Nick Foster owes Nick Corgan a six-pack of beer!
docs: fixes some warnings.
There is way too much institutional knowledge in these makefiles now. Another reason I'm glad we're going to cmake, which is being kept more sane as all of the problems are already known.
docs: more fixes for generated swig files. This worked before the merge, but this forces the build system to generate these before processing the other swig files.
docs: better install of swig docs .i files since we actually have a variable to take care of it already.
docs: fixing variable for location of header files (SOURCE not BINARY).
docs: more appropriate variable to use when setting the include/headers directory.
docs: installing generated _doc.i files under autotools.
docs: better use of BUILT_SOURCES so I'm not overriding the standard build instructions for it.
docs: Adding swig doc generation to Makefile.am files.
docs: forgot to have the generated .i files installed.
docs: added python doxygen docs to gr-qtgui
qtgui: add python include path (older name)
uhd: change examples to use new stream api
qtgui_sink_c : Fix update rate math.
I botched the conversion to gruel high res timers. This patch fixes things.Checked on x86 byt hand adjusting update rate. We should expose the updaterate setting to users.
Signed-off-by: Philip Balister <[email protected]>
qtgui: these shouldn't be installed.
qtgui: Fixing slot names that can't be #if'd out for compatibility between Qwt 5.2 and 6.0.
examples: making both autotools and cmake install all the same examples.
qtgui: fixed typo for name of export define
This was a typo, but it was ok before the library fubarbecause the define was explicitly set.Now that things are more automatic,it needs to follow convention.
qr-qtgui-sink : Set lower limit of FT size to 256 from 1024.
qtqui-sink : Do not run the FFT unless updating the display.
the libraries
cmake: make python checks optional for cross builds
Merge remote branch 'jblum/cmake_fixes' into next
docs: don't need to distribute README files in docs component. Just the install path.
misc fix missing installed files/tweaks
docs: installing README files.
cmake: fix that component depends on component hack
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts: gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h gr-digital/include/digital_ofdm_cyclic_prefixer.h...
qtgui: missed something before.
qtgui: a few more fixes for qwt 5.2/6.0.
Conflicts: gr-qtgui/lib/Makefile.am
qtgui: more compatability issues.
qtgui: wip: working to make plots backwards compatible with qwt 5.2.
qtgui: adjusting intensity knobs and auto scale in waterfall works in qwt6.
qtgui: fixed waterfall color map issue under qwt6.
qtgui: waterfall plot mostly working under qwt6 (plots, but updates to scale and color not working yet).
qtgui: constellation plot working again under qwt6.
qtgui: Time domain plot working againt under qwt6.
qtgui: wip: updating qtgui to work with QWT 6 (and trying to maintain backwards compatability to 5.2). This wip works for just the fft plots.
qtgui: avoids a simple warning.
Conflicts: gr-digital/include/digital_constellation.h
adding gitignore files to new directories.
doc: adding qtgui Doxygen documentation page and a README file.
docs and qtgui: adding Doxygen documentation for each class. Also changed the default behavior for the qtgui_sink_f to turn the constellation plot off by default (doesn't make sense with out the Q part, too).
qtgui: sneaking in a fix to add an include directory to gr-qtgui.
gr: the CMakeLists.txt took a chill pill
Conflicts: gr-qtgui/apps/usrp_display.py
qtgui: removed usrp and usrp2-specific apps; replaced with a UHD version.
qtgui: moved actual examples to new examples directory.
qtgui: fixing import statements in qtgui apps to print an error if extra python modules are not available.
cmake: language tweak for component group description
Merge branch 'next' of gnuradio.org:gnuradio into next
fixed some more warnings; mostly in doxygen or order of variable initialization.
Fixed warnings generated from improper includes in swig interface file.
gr: squashed cmakelists.txt into one commit
Merge branch '8psk' into next
Conflicts: gr-msdd6000/src/Makefile.swig.gen
qtgui: missed this when updating time info.
gr: added to the .gitignores to various components for in-tree builds
Merge branch 'master' into 8psk
Conflicts: gr-qtgui/lib/qtgui_time_sink_c.cc gr-trellis/src/lib/Makefile.am gr-trellis/src/lib/calc_metric.h gr-trellis/src/lib/trellis.i gr-trellis/src/lib/trellis_constellation_metrics_cf.i gr-trellis/src/lib/trellis_metric_type.h...
added high_res_timer_epoch to give ticks at the epoch
qtgui: make a common function for the time label creation in waterfall
qtgui: removed all traces of highResTimeFunctions.h
qtgui: removed most of the functions in highResTimeFunctions.h
qtgui: partially switch to gruel high res timer
