diff options
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/wxgui_fftsink2.xml | 37 | ||||
| -rw-r--r-- | grc/blocks/wxgui_numbersink2.xml | 2 | ||||
| -rw-r--r-- | grc/blocks/wxgui_waterfallsink2.xml | 57 |
3 files changed, 83 insertions, 13 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> diff --git a/grc/blocks/wxgui_numbersink2.xml b/grc/blocks/wxgui_numbersink2.xml index 5289db8af..ad93dec08 100644 --- a/grc/blocks/wxgui_numbersink2.xml +++ b/grc/blocks/wxgui_numbersink2.xml @@ -123,7 +123,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> diff --git a/grc/blocks/wxgui_waterfallsink2.xml b/grc/blocks/wxgui_waterfallsink2.xml index cee598990..3de67597f 100644 --- a/grc/blocks/wxgui_waterfallsink2.xml +++ b/grc/blocks/wxgui_waterfallsink2.xml @@ -7,6 +7,7 @@ <block> <name>Waterfall Sink</name> <key>wxgui_waterfallsink2</key> + <import>from gnuradio import window</import> <import>from gnuradio.wxgui import waterfallsink2</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' waterfallsink2.$(type.fcn)( @@ -18,9 +19,12 @@ waterfallsink2.$(type.fcn)( sample_rate=$samp_rate, fft_size=$fft_size, fft_rate=$fft_rate, - average=$options.average, + average=$average, avg_alpha=#if $avg_alpha() then $avg_alpha else 'None'#, title=$title, +#if $win() + win=$win, +#end if #if $win_size() size=$win_size, #end if @@ -97,25 +101,56 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos())))) <type>int</type> </param> <param> + <name>Average</name> + <key>average</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>On</name> + <key>True</key> + </option> + <option> + <name>Off</name> + <key>False</key> + </option> + </param> + <param> <name>Average Alpha</name> <key>avg_alpha</key> <value>0</value> <type>real</type> + <hide>#if $average() == 'True' then 'none' else 'all'#</hide> </param> <param> - <name>Options</name> - <key>options</key> - <value>none</value> - <type>enum</type> + <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>None</name> - <key>none</key> - <opt>average:False</opt> + <name>Rectangular</name> + <key>window.rectangular</key> </option> <option> - <name>Average</name> - <key>average</key> - <opt>average:True</opt> + <name>Flattop</name> + <key>window.flattop</key> </option> </param> <param> |