Merged r11309:11357 from grc branch.

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

diff --git a/grc/blocks/wxgui_waterfallsink2.xml b/grc/blocks/wxgui_waterfallsink2.xml
index 6d76ee86751531307be765587ec66c6e992cf771..c7d53f9f2164752c0007f34519d86797f3ff94a8 100644 (file)
--- a/grc/blocks/wxgui_waterfallsink2.xml
+++ b/grc/blocks/wxgui_waterfallsink2.xml
@@ -8,8 +8,9 @@
        <name>Waterfall Sink</name>
        <key>wxgui_waterfallsink2</key>
        <import>from gnuradio.wxgui import waterfallsink2</import>
-       <make>waterfallsink2.$(type.fcn)(
-       self.GetWin(),
+       <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
+waterfallsink2.$(type.fcn)(
+       $(parent).GetWin(),
        baseband_freq=$baseband_freq,
        y_per_div=$y_per_div,
        ref_level=$ref_level,
@@ -20,11 +21,10 @@
        avg_alpha=#if $avg_alpha() then $avg_alpha else 'None'#,
        title=$title,
 )
-#set $grid_pos = $grid_pos()
-#if not grid_pos
-self.Add(self.$(id).win)
+#if not $grid_pos()
+$(parent).Add(self.$(id).win)
 #else
-self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+$(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
 #end if</make>
        <callback>set_baseband_freq($baseband_freq)</callback>
        <callback>set_sample_rate($samp_rate)</callback>
@@ -114,6 +114,12 @@ self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos
                <value></value>
                <type>grid_pos</type>
        </param>
+       <param>
+               <name>Notebook</name>
+               <key>notebook</key>
+               <value></value>
+               <type>notebook</type>
+       </param>
        <sink>
                <name>in</name>
                <type>$type</type>
@@ -122,5 +128,7 @@ self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos
 Set Average Alpha to 0 for automatic setting.
 
 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.
        </doc>
 </block>