diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-19 14:31:21 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-19 14:31:21 -0400 |
| commit | a8770d2d605e7a9e767f5d08d5c1610e107b7ac3 (patch) | |
| tree | 4000a1773d031f446965dc2c3c2ceceb08815660 /gr-wxgui/python | |
| parent | 806ae9368dd55ba6a464558e9cbf1e323020b583 (diff) | |
| parent | 50d9b3282ae65b7cf6bf007ab8f32b4ae7cc3ed1 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-wxgui/python/fftsink_nongl.py
gr-wxgui/python/waterfallsink_nongl.py
Diffstat (limited to 'gr-wxgui/python')
| -rw-r--r-- | gr-wxgui/python/fftsink_nongl.py | 2 | ||||
| -rw-r--r-- | gr-wxgui/python/waterfallsink_nongl.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gr-wxgui/python/fftsink_nongl.py b/gr-wxgui/python/fftsink_nongl.py index 73bc7f41b0..ade23f9f86 100644 --- a/gr-wxgui/python/fftsink_nongl.py +++ b/gr-wxgui/python/fftsink_nongl.py @@ -102,6 +102,8 @@ class fft_sink_base(object): def _set_n(self): self.one_in_n.set_n(max(1, int(self.sample_rate/self.fft_size/self.fft_rate))) + def set_callback(self, callb): + return class fft_sink_f(gr.hier_block2, fft_sink_base): def __init__(self, parent, baseband_freq=0, ref_scale=2.0, diff --git a/gr-wxgui/python/waterfallsink_nongl.py b/gr-wxgui/python/waterfallsink_nongl.py index bd93a84ab7..5cfcd24413 100644 --- a/gr-wxgui/python/waterfallsink_nongl.py +++ b/gr-wxgui/python/waterfallsink_nongl.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2003-2008,2012 Free Software Foundation, Inc. +# Copyright 2003-2005,2007,2008,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -74,6 +74,9 @@ class waterfall_sink_base(object): def _set_n(self): self.one_in_n.set_n(max(1, int(self.sample_rate/self.fft_size/self.fft_rate))) + def set_callback(self, callb): + return + 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, |