diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-08 04:36:24 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-08 04:36:24 +0000 |
| commit | 05005e3d3fad3c9baee9906714510b5d12e0fa6f (patch) | |
| tree | 6f3785d80ac03b213dce984c9eb14be9b4c86571 /gnuradio-examples/python/multi-antenna/multi_scope.py | |
| parent | 42ad2adb86981f4488edbe33169683f787b807c3 (diff) | |
Removed gr.flow_graph, gr.hier_block and friends. From here on out
all work on the trunk must use gr.top_block and gr.hier_block2.
Merged eb/fg-no-more -r7602:7606 into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7607 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/multi-antenna/multi_scope.py')
| -rwxr-xr-x | gnuradio-examples/python/multi-antenna/multi_scope.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py index b35e916519..8db183d6f8 100755 --- a/gnuradio-examples/python/multi-antenna/multi_scope.py +++ b/gnuradio-examples/python/multi-antenna/multi_scope.py @@ -6,7 +6,7 @@ from gnuradio.eng_option import eng_option from gnuradio import eng_notation from gnuradio import optfir from optparse import OptionParser -from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider +from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider import wx from usrpm import usrp_dbid import time @@ -16,10 +16,10 @@ import sys # required FPGA that can do 4 rx channels. -class my_graph(stdgui.gui_flow_graph): +class my_top_block(stdgui2.std_top_block): def __init__(self, frame, panel, vbox, argv): - stdgui.gui_flow_graph.__init__(self) + stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv) self.frame = frame self.panel = panel @@ -78,7 +78,8 @@ class my_graph(stdgui.gui_flow_graph): self.connect(self.u, di) # our destination (8 float inputs) - self.scope = scopesink.scope_sink_f(self, panel, sample_rate=input_rate/sw_decim) + self.scope = scopesink2.scope_sink_f(panel, sample_rate=input_rate/sw_decim, + num_inputs=2*nchan) # taps for channel filter chan_filt_coeffs = optfir.low_pass (1, # gain @@ -131,7 +132,7 @@ class my_graph(stdgui.gui_flow_graph): def main (): - app = stdgui.stdapp(my_graph, "Multi Scope", nstatus=1) + app = stdgui2.stdapp(my_top_block, "Multi Scope", nstatus=1) app.MainLoop() if __name__ == '__main__': |