Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-17 | 17 | -153/+551 | |
|\| | | ||||||
| * | | Merge branch 'master' into next | Tom Rondeau | 2011-10-16 | 17 | -153/+551 | |
| |\| | | | | | | | | | | | | | Conflicts: gr-qtgui/lib/Makefile.am | |||||
| | * | qtgui: more compatability issues. | Tom Rondeau | 2011-10-16 | 12 | -25/+112 | |
| | | | ||||||
| | * | qtgui: wip: working to make plots backwards compatible with qwt 5.2. | Tom Rondeau | 2011-10-16 | 2 | -6/+60 | |
| | | | ||||||
| | * | qtgui: adjusting intensity knobs and auto scale in waterfall works in qwt6. | Tom Rondeau | 2011-10-16 | 1 | -5/+3 | |
| | | | ||||||
| | * | qtgui: fixed waterfall color map issue under qwt6. | Tom Rondeau | 2011-10-16 | 1 | -19/+74 | |
| | | | ||||||
| | * | qtgui: waterfall plot mostly working under qwt6 (plots, but updates to scale ↵ | Tom Rondeau | 2011-10-16 | 10 | -142/+116 | |
| | | | | | | | | | | | | and color not working yet). | |||||
| | * | qtgui: constellation plot working again under qwt6. | Tom Rondeau | 2011-10-16 | 4 | -15/+15 | |
| | | | ||||||
| | * | qtgui: Time domain plot working againt under qwt6. | Tom Rondeau | 2011-10-16 | 4 | -20/+19 | |
| | | | ||||||
| | * | qtgui: wip: updating qtgui to work with QWT 6 (and trying to maintain ↵ | Tom Rondeau | 2011-10-15 | 18 | -160/+390 | |
| | | | | | | | | | | | | backwards compatability to 5.2). This wip works for just the fft plots. | |||||
| | * | qtgui: avoids a simple warning. | Tom Rondeau | 2011-10-15 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-10-11 | 20 | -18/+242 | |
|\| | | | | | | | | | | | | | | Conflicts: gr-digital/include/digital_constellation.h | |||||
| * | | adding gitignore files to new directories. | Tom Rondeau | 2011-10-09 | 2 | -0/+4 | |
| | | | ||||||
| * | | doc: adding qtgui Doxygen documentation page and a README file. | Tom Rondeau | 2011-10-09 | 3 | -0/+116 | |
| | | | ||||||
| * | | docs and qtgui: adding Doxygen documentation for each class. Also changed ↵ | Tom Rondeau | 2011-10-09 | 5 | -2/+44 | |
| | | | | | | | | | | | | 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. | Tom Rondeau | 2011-10-09 | 11 | -10/+43 | |
| | | | ||||||
* | | | gr: the CMakeLists.txt took a chill pill | Josh Blum | 2011-10-08 | 5 | -55/+55 | |
| | | | ||||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-09-26 | 6 | -17/+152 | |
|\| | | ||||||
| * | | Merge branch 'master' into next | Johnathan Corgan | 2011-09-24 | 6 | -17/+152 | |
| |\| | | | | | | | | | | | | | Conflicts: gr-qtgui/apps/usrp_display.py | |||||
| | * | qtgui: fixing import statements in qtgui apps to print an error if extra ↵ | Tom Rondeau | 2011-09-23 | 7 | -18/+153 | |
| | | | | | | | | | | | | python modules are not available. | |||||
* | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-09-24 | 10 | -343/+81 | |
|\| | | ||||||
| * | | qtgui: removed usrp and usrp2-specific apps; replaced with a UHD version. | Tom Rondeau | 2011-09-23 | 3 | -339/+44 | |
| | | | ||||||
| * | | qtgui: moved actual examples to new examples directory. | Tom Rondeau | 2011-09-23 | 8 | -4/+37 | |
| | | | ||||||
* | | | cmake: language tweak for component group description | Josh Blum | 2011-08-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Josh Blum | 2011-07-28 | 2 | -5/+5 | |
|\| | | ||||||
| * | | fixed some more warnings; mostly in doxygen or order of variable initialization. | Tom Rondeau | 2011-07-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into next | Tom Rondeau | 2011-07-27 | 1 | -4/+4 | |
| |\| | | | | | | | | | | | | | | | | * master: Fixed warnings generated from improper includes in swig interface file. Fixed doxygen warning in gr-uhd | |||||
| | * | Fixed warnings generated from improper includes in swig interface file. | Tom Rondeau | 2011-07-27 | 1 | -4/+4 | |
| | | | ||||||
* | | | gr: squashed cmakelists.txt into one commit | Josh Blum | 2011-07-20 | 5 | -0/+353 | |
|/ / | ||||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2011-07-19 | 1 | -1/+0 | |
|\| | ||||||
| * | qtgui: missed this when updating time info. | Tom Rondeau | 2011-07-10 | 1 | -1/+0 | |
| | | ||||||
* | | Merge branch '8psk' into next | Tom Rondeau | 2011-07-17 | 7 | -61/+59 | |
|\ \ | |/ |/| | | | | | Conflicts: gr-msdd6000/src/Makefile.swig.gen | |||||
| * | Merge branch 'master' into 8psk | Tom Rondeau | 2011-06-13 | 20 | -375/+109 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t | |||||
| * | | gr-qtgui: adding the various windows as initial options for the qtgui sink ↵ | Tom Rondeau | 2011-05-09 | 1 | -0/+20 | |
| | | | | | | | | | | | | in GRC. | |||||
| * | | gr-qtgui: makes time sink a sync_block (since it is) and uses ↵ | Tom Rondeau | 2011-05-09 | 6 | -62/+40 | |
| | | | | | | | | | | | | set_output_multiple instead of forecast. The result is that multiple streams maintain constant relationship, which they did not before. This should also prevent us from having to keep so much book-keeping of the indecies, and we will hopefully be able to clean this up soon. | |||||
* | | | gr: added to the .gitignores to various components for in-tree builds | Josh Blum | 2011-07-03 | 3 | -0/+4 | |
| |/ |/| | ||||||
* | | added high_res_timer_epoch to give ticks at the epoch | Josh Blum | 2011-06-07 | 1 | -1/+1 | |
| | | ||||||
* | | qtgui: make a common function for the time label creation in waterfall | Josh Blum | 2011-06-07 | 1 | -19/+16 | |
| | | ||||||
* | | qtgui: removed all traces of highResTimeFunctions.h | Josh Blum | 2011-06-07 | 19 | -57/+54 | |
| | | ||||||
* | | qtgui: removed most of the functions in highResTimeFunctions.h | Josh Blum | 2011-06-07 | 7 | -50/+24 | |
| | | ||||||
* | | qtgui: partially switch to gruel high res timer | Josh Blum | 2011-06-07 | 9 | -289/+31 | |
| | | ||||||
* | | qtgui: replace timespec with typedef so its easier to replace | Josh Blum | 2011-06-07 | 16 | -135/+159 | |
|/ | ||||||
* | Merge branch 'mergme/qtgui/api_exports' | Tom Rondeau | 2011-04-24 | 8 | -16/+56 | |
|\ | ||||||
| * | qtgui: added GR_QTGUI_API declaration to qtgui library classes and functions | Josh Blum | 2011-04-24 | 8 | -16/+56 | |
| | | ||||||
* | | qtgui: use the timespec_reset function | Josh Blum | 2011-04-24 | 2 | -2/+2 | |
|/ | | | | Its more proper, and the assignment is c99 only. | |||||
* | Merge branch 'qtgui_time' | Tom Rondeau | 2011-04-24 | 33 | -132/+1864 | |
|\ | | | | | | | | | Conflicts: gr-qtgui/apps/pyqt_example_f.py | |||||
| * | gr-qtgui: adding GRC component for time_sink block. | Tom Rondeau | 2011-04-24 | 2 | -0/+79 | |
| | | ||||||
| * | gr-qtgui: splitting qtgui.i into its complex and float .i files to keep with ↵ | Tom Rondeau | 2011-04-24 | 4 | -48/+71 | |
| | | | | | | | | the general standard. | |||||
| * | gr-qtgui: Adding float interface to qtgui_time_sink and example program. | Tom Rondeau | 2011-04-24 | 8 | -3/+515 | |
| | | ||||||
| * | gr-qtgui: adding example for using the new qt_time_sink_c interface. | Tom Rondeau | 2011-04-24 | 2 | -0/+164 | |
| | |