[Commit-gnuradio] r11448 - in gnuradio/trunk: gr-wxgui/src/python grc grc/blocks

[jblum]

Author: jblum
Date: 2009-07-15 23:06:00 -0600 (Wed, 15 Jul 2009)
New Revision: 11448

Modified:
   gnuradio/trunk/gr-wxgui/src/python/waterfallsink_nongl.py
   gnuradio/trunk/grc/blocks/wxgui_waterfallsink2.xml
   gnuradio/trunk/grc/todo.txt
Log:
There is no y per div, but there is a dynamic range.
Added **kwargs to nongl for backwards compadibility.
Updated todo.



Modified: gnuradio/trunk/gr-wxgui/src/python/waterfallsink_nongl.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/waterfallsink_nongl.py   2009-07-15 
18:34:53 UTC (rev 11447)
+++ gnuradio/trunk/gr-wxgui/src/python/waterfallsink_nongl.py   2009-07-16 
05:06:00 UTC (rev 11448)
@@ -75,7 +75,7 @@
     def __init__(self, parent, baseband_freq=0,
                  y_per_div=10, ref_level=50, sample_rate=1, fft_size=512,
                  fft_rate=default_fft_rate, average=False, avg_alpha=None,
-                 title='', size=default_fftsink_size):
+                 title='', size=default_fftsink_size, **kwargs):
 
         gr.hier_block2.__init__(self, "waterfall_sink_f",
                                 gr.io_signature(1, 1, gr.sizeof_float),
@@ -106,7 +106,7 @@
     def __init__(self, parent, baseband_freq=0,
                  y_per_div=10, ref_level=50, sample_rate=1, fft_size=512,
                  fft_rate=default_fft_rate, average=False, avg_alpha=None, 
-                 title='', size=default_fftsink_size):
+                 title='', size=default_fftsink_size, **kwargs):
 
         gr.hier_block2.__init__(self, "waterfall_sink_f",
                                 gr.io_signature(1, 1, gr.sizeof_gr_complex),

Modified: gnuradio/trunk/grc/blocks/wxgui_waterfallsink2.xml
===================================================================
--- gnuradio/trunk/grc/blocks/wxgui_waterfallsink2.xml  2009-07-15 18:34:53 UTC 
(rev 11447)
+++ gnuradio/trunk/grc/blocks/wxgui_waterfallsink2.xml  2009-07-16 05:06:00 UTC 
(rev 11448)
@@ -12,7 +12,7 @@
 waterfallsink2.$(type.fcn)(
        $(parent).GetWin(),
        baseband_freq=$baseband_freq,
-       y_per_div=$y_per_div,
+       dynamic_range=$dynamic_range,
        ref_level=$ref_level,
        sample_rate=$samp_rate,
        fft_size=$fft_size,
@@ -63,9 +63,9 @@
                <type>real</type>
        </param>
        <param>
-               <name>Y per Div</name>
-               <key>y_per_div</key>
-               <value>10</value>
+               <name>Dynamic Range</name>
+               <key>dynamic_range</key>
+               <value>100</value>
                <type>real</type>
        </param>
        <param>

Modified: gnuradio/trunk/grc/todo.txt
===================================================================
--- gnuradio/trunk/grc/todo.txt 2009-07-15 18:34:53 UTC (rev 11447)
+++ gnuradio/trunk/grc/todo.txt 2009-07-16 05:06:00 UTC (rev 11448)
@@ -24,11 +24,15 @@
   * gr_ofdm_sampler
 * size params for the graphical sinks
 * callbacks for set average on fft, waterfall, number sinks
+* add units to params: Sps, Hz, dB...
+* command line options should replace _ with - for the --option
 
 ##################################################
 # Features
 ##################################################
 * extract category from doxygen
+  * fix up block tree to mirror current doxygen group
+  * remove blocks in block tree covered by doxygen
 * param editor, expand entry boxes in focus
 * change param dialog to panel within main window
 * search for blocks in category window