Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | core: adding msg_connect, updating msg interface, adding symbolic block names | Tim O'Shea | 2012-11-29 | 4 | -1/+18 | |
| | | ||||||
* | | Revert "core: adding msg_connect, updating msg interface, adding symbolic ↵ | Johnathan Corgan | 2012-11-29 | 4 | -18/+1 | |
| | | | | | | | | | | | | | | | | block names" (to be reapplied on master branch and re-merged in) This reverts commit 7fc857a18cdc47f333db56cfedd2a4ed1a8432a9. | |||||
* | | core: adding msg_connect, updating msg interface, adding symbolic block names | Tim O'Shea | 2012-11-28 | 4 | -1/+18 | |
| | | ||||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-10-05 | 2 | -0/+3 | |
|\| | ||||||
| * | grc: revert changes to flow_graph.tmpl, runtime enforces this | Josh Blum | 2012-10-05 | 1 | -2/+2 | |
| | | ||||||
| * | grc: added optional flag to pad source and sink | Josh Blum | 2012-10-04 | 3 | -2/+5 | |
| | | ||||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-09-28 | 2 | -1/+3 | |
|\| | ||||||
| * | added the ability to open custom GRC hier block definitions from graphs ↵ | Tim O'Shea | 2012-09-28 | 2 | -1/+3 | |
| | | | | | | | | using an instance of them | |||||
* | | docs: Modified argument formating in python docstrings in grc. | Ben Reynwar | 2012-08-14 | 7 | -57/+151 | |
| | | ||||||
* | | Merge branch 'master' into my_qtsink | Tom Rondeau | 2012-06-24 | 4 | -5/+25 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-qtgui/include/qtgui_sink_c.h gr-qtgui/include/qtgui_sink_f.h gr-qtgui/include/qtgui_util.h gr-qtgui/lib/ConstellationDisplayPlot.cc gr-qtgui/lib/FrequencyDisplayPlot.cc gr-qtgui/lib/SpectrumGUIClass.cc gr-qtgui/lib/TimeDomainDisplayPlot.cc gr-qtgui/lib/WaterfallDisplayPlot.cc gr-qtgui/lib/qtgui_sink_c.cc gr-qtgui/lib/qtgui_sink_f.cc gr-qtgui/lib/spectrumdisplayform.cc | |||||
| * | Merge branch 'maint' | Johnathan Corgan | 2012-05-31 | 1 | -0/+4 | |
| |\ | ||||||
| | * | grc: restore virtual ports in grc | Justin R. Cutler | 2012-05-31 | 1 | -0/+4 | |
| | | | ||||||
| * | | GRC: patch to allow users to specify max_noutput_items in GRC options block. | Jose Quaresma | 2012-05-03 | 1 | -0/+16 | |
| |/ | ||||||
| * | Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵ | Tom Rondeau | 2012-04-13 | 2 | -5/+5 | |
| | | | | | | | | | | | | this in the future. The sed script was provided by Moritz Fischer. | |||||
* | | qtgui: GRC template sets tb = None on exit for widget cleanup; waterfall ↵ | Nick Foster | 2012-04-16 | 1 | -0/+1 | |
| | | | | | | | | plot no longer deletes Widget objects (causes double free). | |||||
* | | qtgui: added to GRC template window geometry save/restore. saves to QT prefs ↵ | Nick Foster | 2012-04-14 | 1 | -0/+13 | |
|/ | | | | | | | based on the block ID. also reduced widget minimum sizes for better behavior on laptops/small screens. there is a bug where the freq sink will sometimes not resize on init -- suspect there's a race there. | |||||
* | Merge remote branch 'jblum/wip_grc_any_blocks' | Johnathan Corgan | 2012-04-07 | 1 | -7/+50 | |
|\ | ||||||
| * | grc: resolve down and up stream for empty types | Josh Blum | 2012-03-25 | 1 | -7/+50 | |
| | | ||||||
* | | Removed autotools, gr-waveform, some cleanup | Johnathan Corgan | 2011-12-08 | 2 | -45/+0 | |
|/ | | | | Nick Foster owes Nick Corgan a six-pack of beer! | |||||
* | grc: replaced doxygen extracted docs with python docstrings | Josh Blum | 2011-11-17 | 6 | -112/+13 | |
| | ||||||
* | grc: fix bug when displaying string params | Josh Blum | 2011-10-29 | 1 | -0/+1 | |
| | | | | | | If the param contents evald successfully but not to a string, it would display None. This patch forces an exception, so the string will get auto-quoted and interpreted correctly. | |||||
* | Merge branch 'master' into next | Josh Blum | 2011-10-19 | 2 | -9/+13 | |
|\ | ||||||
| * | grc: tweaks for colors, added 64 int, vector darken | Josh Blum | 2011-10-19 | 2 | -9/+13 | |
| | | ||||||
* | | grc: added throttle tag to blocks that throttle | Josh Blum | 2011-10-19 | 3 | -3/+7 | |
| | | ||||||
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-19 | 1 | -2/+1 | |
|\ \ | ||||||
| * | | Removing usrp, usrp2, gr-usrp, gr-usrp2. Everything is moving to using UHD. ↵ | Tom Rondeau | 2011-10-19 | 1 | -2/+1 | |
| | | | | | | | | | | | | Also removes related M4 and dependency requirements for USRP-related libs. | |||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-17 | 1 | -1/+4 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 gr-digital/include/digital_ofdm_frame_acquisition.h gr-digital/include/digital_ofdm_frame_sink.h gr-digital/include/digital_ofdm_insert_preamble.h gr-digital/include/digital_ofdm_mapper_bcv.h gr-digital/include/digital_ofdm_sampler.h | |||||
| * | | Merge branch 'next' into dig_ofdm | Tom Rondeau | 2011-10-17 | 5 | -42/+62 | |
| |\| | ||||||
| * | | docs: Updated some docs and made it so GRC can pull docs in from other ↵ | Tom Rondeau | 2011-10-14 | 1 | -1/+4 | |
| | | | | | | | | | | | | components like vocoder and digital. | |||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-14 | 5 | -42/+62 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | grc: append index to duplicated ports | Josh Blum | 2011-10-12 | 1 | -4/+10 | |
| | | | ||||||
| * | | grc: added new IO types | Josh Blum | 2011-10-12 | 4 | -38/+52 | |
| |/ | | | | | | | | | | | | | | | | | | | Added all complex/real float/integer types. Used volk naming convention: fc32, etc... The port type checking now relies on IO size, therefore a short vector of length 2 can connect to a complex short, a float can connect to an int. Basically, the same size checking done in gnuradio runtime. | |||||
* | | gr: the CMakeLists.txt took a chill pill | Josh Blum | 2011-10-08 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'next' of gnuradio.org:gnuradio into next | Josh Blum | 2011-09-22 | 1 | -1/+1 | |
|\| | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h volk/bootstrap | |||||
| * | Merge branch 'maint' | Tom Rondeau | 2011-09-22 | 1 | -1/+1 | |
| |\ | ||||||
| | * | grc: one line fix to fix port duplicator when removing ports | Josh Blum | 2011-09-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | was an issue when removing more than one port | |||||
* | | | gr: squashed cmakelists.txt into one commit | Josh Blum | 2011-07-20 | 1 | -0/+45 | |
|/ / | ||||||
* / | grc: qtgui windows have scrollbars (thanks jason) | Josh Blum | 2011-06-22 | 1 | -1/+10 | |
|/ | ||||||
* | grc: disable pythonw on darwin, apparently not needed | Josh Blum | 2011-06-09 | 1 | -2/+3 | |
| | ||||||
* | Merge branch 'mergeme/grc/cross_platform_work' | Tom Rondeau | 2011-05-02 | 9 | -79/+78 | |
|\ | ||||||
| * | grc: added logic to discover the path to the python interpreter | Josh Blum | 2011-04-19 | 2 | -9/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | Rather than simply exec-ing the application w/ "python", use the same interpreter that executed grc w/ full path. Added code to handle the following exceptions: - for a wx app on mac osx, use the pythonw interpreter (this was in the m4 file, but its easier as a runtime check) - for a no gui app on linux, prepend xterm cuz its nice (we were already doing that but its now restricted to linux) | |||||
| * | grc: replaced asserts in base subdirectory | Josh Blum | 2011-04-14 | 1 | -9/+6 | |
| | | ||||||
| * | grc: replaced asserts in python subdirectory | Josh Blum | 2011-04-14 | 7 | -69/+63 | |
| | | ||||||
| * | grc: define __doc__ for license in case its optimized out (that was easy) | Josh Blum | 2011-04-14 | 1 | -1/+1 | |
| | | ||||||
* | | grc: fix hier block generation w/ multiple pad blocks | Josh Blum | 2011-04-21 | 3 | -27/+34 | |
|/ | ||||||
* | grc: stop the top block after qapp exec for qtgui generation | Josh Blum | 2011-04-13 | 1 | -0/+1 | |
| | ||||||
* | grc: fix for generating top block when in run to completion mode | Josh Blum | 2011-04-07 | 1 | -1/+1 | |
| | ||||||
* | qtgui-grc: added suport in main template for theme icon | Josh Blum | 2011-03-07 | 1 | -1/+2 | |
| | ||||||
* | qtgui-grc: minor tweaks to the various things | Josh Blum | 2011-03-07 | 1 | -0/+1 | |
| | ||||||
* | qtgui-grc: use a vboxlayout for the top_layout | Josh Blum | 2011-03-04 | 1 | -1/+1 | |
| |