Hi,
this patch adds framerate support for gl versions of the mentioned sinks. The
waterfall sink uses the same key as the fft sink (same behaviour as the nongl
versions), the scope sink uses a new key 'scope_rate', as the gl scope sink
does not support fixed rate decimation, but supports a frame rate as the
other two sinks
Patch affects source of the two sinks as well as the config file.
Stefan
--
Stefan Brüns / Bergstraße 21 / 52062 Aachen
mailto:lurch at gmx.li http://www.kawo1.rwth-aachen.de/~lurchi/
phone: +49 241 53809034 mobile: +49 151 50412019
Index: gr-wxgui/src/python/scopesink_gl.py
===================================================================
--- gr-wxgui/src/python/scopesink_gl.py (revision 9598)
+++ gr-wxgui/src/python/scopesink_gl.py (working copy)
@@ -48,7 +48,7 @@
num_inputs=1,
ac_couple=False,
xy_mode=False,
- frame_rate=scope_window.DEFAULT_FRAME_RATE,
+ frame_rate=gr.prefs().get_long('wxgui', 'scope_rate', scope_window.DEFAULT_FRAME_RATE),
):
if t_scale is None: t_scale = 0.001
#init
Index: gr-wxgui/src/python/waterfallsink_gl.py
===================================================================
--- gr-wxgui/src/python/waterfallsink_gl.py (revision 9598)
+++ gr-wxgui/src/python/waterfallsink_gl.py (working copy)
@@ -44,7 +44,7 @@
ref_level=50,
sample_rate=1,
fft_size=512,
- fft_rate=waterfall_window.DEFAULT_FRAME_RATE,
+ fft_rate=gr.prefs().get_long('wxgui', 'fft_rate', waterfall_window.DEFAULT_FRAME_RATE),
average=False,
avg_alpha=None,
title='',
Index: gr-wxgui/gr-wxgui.conf
===================================================================
--- gr-wxgui/gr-wxgui.conf (revision 9598)
+++ gr-wxgui/gr-wxgui.conf (working copy)
@@ -5,4 +5,5 @@
[wxgui]
style = auto # 'gl', 'nongl', or 'auto'
fft_rate = 15 # fftsink and waterfallsink
-frame_decim = 1 # scopesink
+frame_decim = 1 # scopesink (nongl version)
+scope_rate = 15 # scopesink (gl version)
_______________________________________________
Patch-gnuradio mailing list
Patch-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/patch-gnuradio
