diff options
| author | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-06 02:28:52 +0000 |
|---|---|---|
| committer | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-06 02:28:52 +0000 |
| commit | 25c5d91fb7c4b54f1e7d77fd9af213a3675a8339 (patch) | |
| tree | 317d2e623aa9de602197089dab6dcc4fbb17da6f /gr-wxgui | |
| parent | a6396abe127c504f890d0cd45171c46ebfbb0f3d (diff) | |
Merged r11309:11357 from grc branch.
Adds notebook cabability to grc and its wxgui windows/controls.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11358 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-wxgui')
| -rw-r--r-- | gr-wxgui/src/python/plotter/plotter_base.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/src/python/waterfallsink_gl.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gr-wxgui/src/python/plotter/plotter_base.py b/gr-wxgui/src/python/plotter/plotter_base.py index 662365a37f..dede5a0ad5 100644 --- a/gr-wxgui/src/python/plotter/plotter_base.py +++ b/gr-wxgui/src/python/plotter/plotter_base.py @@ -168,4 +168,5 @@ class plotter_base(wx.glcanvas.GLCanvas, common.mutex): """ Force a paint event. """ + if not self._gl_init_flag: return wx.PostEvent(self, wx.PaintEvent()) diff --git a/gr-wxgui/src/python/waterfallsink_gl.py b/gr-wxgui/src/python/waterfallsink_gl.py index 91c1c7eb5d..2d4c959f8a 100644 --- a/gr-wxgui/src/python/waterfallsink_gl.py +++ b/gr-wxgui/src/python/waterfallsink_gl.py @@ -40,7 +40,6 @@ class _waterfall_sink_base(gr.hier_block2): self, parent, baseband_freq=0, - y_per_div=None, #ignore (old wrapper) ref_level=50, sample_rate=1, fft_size=512, @@ -52,6 +51,7 @@ class _waterfall_sink_base(gr.hier_block2): ref_scale=2.0, dynamic_range=80, num_lines=256, + **kwargs #do not end with a comma ): #ensure avg alpha if avg_alpha is None: avg_alpha = 2.0/fft_rate |