diff options
| author | Josh Blum | 2009-10-28 16:17:24 -0700 |
|---|---|---|
| committer | Josh Blum | 2009-10-28 16:17:24 -0700 |
| commit | 230e062e51d43f389520207cf147838c666a1f21 (patch) | |
| tree | a8808807a56be99bdb9f926370c807725169e63d /grc/blocks/wxgui_fftsink2.xml | |
| parent | 0f688d959441909ec0c1c89ae279d670b2e3f6b2 (diff) | |
| download | gnuradio-230e062e51d43f389520207cf147838c666a1f21.tar.gz gnuradio-230e062e51d43f389520207cf147838c666a1f21.tar.bz2 gnuradio-230e062e51d43f389520207cf147838c666a1f21.zip | |
Added window option to wxgui fft and waterfall sink.
Added rectangular window function to window.py.
Average stays hidden in waterfall, fft, and numbersink wrappers (only avg_alpha shows/hides).
Fixed options in waterfall wrapper to model after fft and numbersink average params.
Diffstat (limited to 'grc/blocks/wxgui_fftsink2.xml')
| -rw-r--r-- | grc/blocks/wxgui_fftsink2.xml | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/grc/blocks/wxgui_fftsink2.xml b/grc/blocks/wxgui_fftsink2.xml index 42bca5ccf..8df8f90d0 100644 --- a/grc/blocks/wxgui_fftsink2.xml +++ b/grc/blocks/wxgui_fftsink2.xml @@ -7,6 +7,7 @@ <block> <name>FFT Sink</name> <key>wxgui_fftsink2</key> + <import>from gnuradio import window</import> <import>from gnuradio.wxgui import fftsink2</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' fftsink2.$(type.fcn)( @@ -23,6 +24,9 @@ fftsink2.$(type.fcn)( avg_alpha=#if $avg_alpha() then $avg_alpha else 'None'#, title=$title, peak_hold=$peak_hold, +#if $win() + win=$win, +#end if #if $win_size() size=$win_size, #end if @@ -144,7 +148,7 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos())))) <key>average</key> <value>False</value> <type>enum</type> - <hide>#if $average() == 'True' then 'none' else 'part'#</hide> + <hide>part</hide> <option> <name>On</name> <key>True</key> @@ -162,6 +166,37 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos())))) <hide>#if $average() == 'True' then 'none' else 'all'#</hide> </param> <param> + <name>Window</name> + <key>win</key> + <value>None</value> + <type>raw</type> + <hide>#if $win() is None then 'part' else 'none'#</hide> + <option> + <name>Automatic</name> + <key>None</key> + </option> + <option> + <name>Blackman-Harris</name> + <key>window.blackmanharris</key> + </option> + <option> + <name>Hamming</name> + <key>window.hamming</key> + </option> + <option> + <name>Hanning</name> + <key>window.hanning</key> + </option> + <option> + <name>Rectangular</name> + <key>window.rectangular</key> + </option> + <option> + <name>Flattop</name> + <key>window.flattop</key> + </option> + </param> + <param> <name>Window Size</name> <key>win_size</key> <value></value> |