There is no y per div, but there is a dynamic range.

Added **kwargs to nongl for backwards compadibility.
Updated todo.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11448 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-wxgui/src/python/waterfallsink_nongl.py b/gr-wxgui/src/python/waterfallsink_nongl.py
index bb478c7cf541adacf6f2f9aea405b55b0e510570..3c25a9d9f25e1f7a71bd179093ba1719aaa25fc2 100644 (file)
--- a/gr-wxgui/src/python/waterfallsink_nongl.py
+++ b/gr-wxgui/src/python/waterfallsink_nongl.py
@@ -75,7 +75,7 @@ class waterfall_sink_f(gr.hier_block2, waterfall_sink_base):
     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 @@ class waterfall_sink_c(gr.hier_block2, waterfall_sink_base):
     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),

diff --git a/grc/blocks/wxgui_waterfallsink2.xml b/grc/blocks/wxgui_waterfallsink2.xml
index c7d53f9f2164752c0007f34519d86797f3ff94a8..79ca356f704e6f92919c803b973f2a4d302bbeb0 100644 (file)
--- a/grc/blocks/wxgui_waterfallsink2.xml
+++ b/grc/blocks/wxgui_waterfallsink2.xml
@@ -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 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
                <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>

diff --git a/grc/todo.txt b/grc/todo.txt
index f715dd1d0964205d490cd3a8489cadd6e950f22e..f8c8021b65fccf2834e24cd4dd125b43d8f2892a 100644 (file)
--- a/grc/todo.txt
+++ b/grc/todo.txt
@@ -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