diff options
| author | Johnathan Corgan | 2009-10-29 06:52:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-10-29 06:52:53 -0700 |
| commit | 8a0affcfb6154cadd1710e682fe09f040ed05a28 (patch) | |
| tree | 680e797323aa598ee497f20fc4a249c4d5aeb83c /gr-wxgui/src/python | |
| parent | 005f14ca07e66056bdc8e33a0cae1d461f5e1b9d (diff) | |
| parent | 230e062e51d43f389520207cf147838c666a1f21 (diff) | |
| download | gnuradio-8a0affcfb6154cadd1710e682fe09f040ed05a28.tar.gz gnuradio-8a0affcfb6154cadd1710e682fe09f040ed05a28.tar.bz2 gnuradio-8a0affcfb6154cadd1710e682fe09f040ed05a28.zip | |
Merge branch 'flattopwindow' of http://gnuradio.org/git/jblum
Merge-fix: Remove debugging print
Merge-fix: Update copyrights
* 'flattopwindow' of http://gnuradio.org/git/jblum:
Added window option to wxgui fft and waterfall sink.
redid cos windows, added flattop and nuttall_cfd
Diffstat (limited to 'gr-wxgui/src/python')
| -rw-r--r-- | gr-wxgui/src/python/fftsink_gl.py | 5 | ||||
| -rw-r--r-- | gr-wxgui/src/python/fftsink_nongl.py | 6 | ||||
| -rw-r--r-- | gr-wxgui/src/python/waterfallsink_gl.py | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py index 9d683d697..8ddea9a8e 100644 --- a/gr-wxgui/src/python/fftsink_gl.py +++ b/gr-wxgui/src/python/fftsink_gl.py @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -52,6 +52,8 @@ class _fft_sink_base(gr.hier_block2, common.wxgui_hb): title='', size=fft_window.DEFAULT_WIN_SIZE, peak_hold=False, + win=None, + **kwargs #do not end with a comma ): #ensure avg alpha if avg_alpha is None: avg_alpha = 2.0/fft_rate @@ -70,6 +72,7 @@ class _fft_sink_base(gr.hier_block2, common.wxgui_hb): ref_scale=ref_scale, avg_alpha=avg_alpha, average=average, + win=win, ) msgq = gr.msg_queue(2) sink = gr.message_sink(gr.sizeof_float*fft_size, msgq, True) diff --git a/gr-wxgui/src/python/fftsink_nongl.py b/gr-wxgui/src/python/fftsink_nongl.py index ca5e91fdb..937eb27cc 100644 --- a/gr-wxgui/src/python/fftsink_nongl.py +++ b/gr-wxgui/src/python/fftsink_nongl.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2003,2004,2005,2006,2007 Free Software Foundation, Inc. +# Copyright 2003,2004,2005,2006,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -93,7 +93,7 @@ class fft_sink_f(gr.hier_block2, fft_sink_base): def __init__(self, parent, baseband_freq=0, ref_scale=2.0, y_per_div=10, y_divs=8, ref_level=50, sample_rate=1, fft_size=512, fft_rate=default_fft_rate, average=False, avg_alpha=None, - title='', size=default_fftsink_size, peak_hold=False): + title='', size=default_fftsink_size, peak_hold=False, **kwargs): gr.hier_block2.__init__(self, "fft_sink_f", gr.io_signature(1, 1, gr.sizeof_float), @@ -136,7 +136,7 @@ class fft_sink_c(gr.hier_block2, fft_sink_base): def __init__(self, parent, baseband_freq=0, ref_scale=2.0, y_per_div=10, y_divs=8, ref_level=50, sample_rate=1, fft_size=512, fft_rate=default_fft_rate, average=False, avg_alpha=None, - title='', size=default_fftsink_size, peak_hold=False): + title='', size=default_fftsink_size, peak_hold=False, **kwargs): gr.hier_block2.__init__(self, "fft_sink_c", gr.io_signature(1, 1, gr.sizeof_gr_complex), diff --git a/gr-wxgui/src/python/waterfallsink_gl.py b/gr-wxgui/src/python/waterfallsink_gl.py index 37844399e..c2c4e8df7 100644 --- a/gr-wxgui/src/python/waterfallsink_gl.py +++ b/gr-wxgui/src/python/waterfallsink_gl.py @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -51,6 +51,7 @@ class _waterfall_sink_base(gr.hier_block2, common.wxgui_hb): ref_scale=2.0, dynamic_range=80, num_lines=256, + win=None, **kwargs #do not end with a comma ): #ensure avg alpha @@ -70,6 +71,7 @@ class _waterfall_sink_base(gr.hier_block2, common.wxgui_hb): ref_scale=ref_scale, avg_alpha=avg_alpha, average=average, + win=win, ) msgq = gr.msg_queue(2) sink = gr.message_sink(gr.sizeof_float*fft_size, msgq, True) |