Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / grc / blocks / wxgui_fftsink2.xml

diff --git a/grc/blocks/wxgui_fftsink2.xml b/grc/blocks/wxgui_fftsink2.xml
index faeca37e3217bea7f8db5860e29ad5117693c1c5..8df8f90d0192de8a5e21d8cdadcb6070c85ddd53 100644 (file)
--- 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)(
@@ -15,6 +16,7 @@ fftsink2.$(type.fcn)(
        y_per_div=$y_per_div,
        y_divs=$y_divs,
        ref_level=$ref_level,
+       ref_scale=$ref_scale,
        sample_rate=$samp_rate,
        fft_size=$fft_size,
        fft_rate=$fft_rate,
@@ -22,6 +24,12 @@ 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
 )
 #if not $grid_pos()
 $(parent).Add(self.$(id).win)
@@ -102,6 +110,12 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
                <value>50</value>
                <type>real</type>
        </param>
+       <param>
+               <name>Ref Scale (p2p)</name>
+               <key>ref_scale</key>
+               <value>2.0</value>
+               <type>real</type>
+       </param>
        <param>
                <name>FFT Size</name>
                <key>fft_size</key>
@@ -134,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>
@@ -151,6 +165,44 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
                <type>real</type>
                <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>
+               <type>int_vector</type>
+               <hide>#if $win_size() then 'none' else 'part'#</hide>
+       </param>
        <param>
                <name>Grid Position</name>
                <key>grid_pos</key>
@@ -163,6 +215,7 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
                <value></value>
                <type>notebook</type>
        </param>
+       <check>not $win_size or len($win_size) == 2</check>
        <sink>
                <name>in</name>
                <type>$type</type>
@@ -170,6 +223,8 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
        <doc>
 Set Average Alpha to 0 for automatic setting.
 
+Leave the window blank for the default size, otherwise enter a tuple of (width, height) pixels.
+
 Use the Grid Position (row, column, row span, column span) to position the graphical element in the window.
 
 Use the Notebook Param (notebook-id, page-index) to place the graphical element inside of a notebook page.