Merged grc developer branch r10679:10938

[debian/gnuradio] / grc / data / platforms / python / blocks / wxgui_numbersink2.xml

diff --git a/grc/data/platforms/python/blocks/wxgui_numbersink2.xml b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
index 3e224228e97cab6345ffb5f2451b9385966acb8a..af0281f6a9fb1afd45933f6dc33695051578235f 100644 (file)
--- a/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
@@ -19,13 +19,13 @@
        ref_level=$ref_level,
        sample_rate=$samp_rate,
        number_rate=$number_rate,
-       average=$options.average,
-       avg_alpha=#if $avg_alpha.eval then $avg_alpha else 'None'#,
+       average=$average,
+       avg_alpha=#if $avg_alpha() then $avg_alpha else 'None'#,
        label=$title,
-       peak_hold=$options.peak_hold,
+       peak_hold=$peak_hold,
        show_gauge=$show_gauge,
 )
-#set $grid_pos = $grid_pos.eval
+#set $grid_pos = $grid_pos()
 #if not grid_pos
 self.Add(self.$(id).win)
 #else
@@ -108,34 +108,41 @@ self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos
                <type>int</type>
        </param>
        <param>
-               <name>Average Alpha</name>
-               <key>avg_alpha</key>
-               <value>0</value>
-               <type>real</type>
-       </param>
-       <param>
-               <name>Options</name>
-               <key>options</key>
-               <value>none</value>
+               <name>Peak Hold</name>
+               <key>peak_hold</key>
+               <value>False</value>
                <type>enum</type>
+               <hide>#if $peak_hold() == 'True' then 'none' else 'part'#</hide>
                <option>
-                       <name>None</name>
-                       <key>none</key>
-                       <opt>peak_hold:False</opt>
-                       <opt>average:False</opt>
+                       <name>On</name>
+                       <key>True</key>
                </option>
                <option>
-                       <name>Average</name>
-                       <key>average</key>
-                       <opt>peak_hold:False</opt>
-                       <opt>average:True</opt>
+                       <name>Off</name>
+                       <key>False</key>
                </option>
+       </param>
+       <param>
+               <name>Average</name>
+               <key>average</key>
+               <value>False</value>
+               <type>enum</type>
+               <hide>#if $average() == 'True' then 'none' else 'part'#</hide>
                <option>
-                       <name>Peak Hold</name>
-                       <key>peak_hold</key>
-                       <opt>peak_hold:True</opt>
-                       <opt>average:False</opt>
+                       <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>Show Gauge</name>