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_fft.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_fft.py')
-rwxr-xr-x | gnuradio-examples/python/multi-antenna/multi_fft.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py index 3a8d481956..0f1dbb1027 100755 --- a/gnuradio-examples/python/multi-antenna/multi_fft.py +++ b/gnuradio-examples/python/multi-antenna/multi_fft.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_graph(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 @@ -89,9 +89,9 @@ class my_graph(stdgui.gui_flow_graph): #print len(chan_filt_coeffs) for i in range(nchan): - scope = fftsink.fft_sink_c(self, panel, sample_rate=input_rate/sw_decim, - title="Input %d" % (i,), - ref_level=80, y_per_div=20) + scope = fftsink2.fft_sink_c(panel, sample_rate=input_rate/sw_decim, + title="Input %d" % (i,), + ref_level=80, y_per_div=20) vbox.Add(scope.win, 10, wx.EXPAND) if options.filter: @@ -121,7 +121,7 @@ class my_graph(stdgui.gui_flow_graph): def main (): - app = stdgui.stdapp(my_graph, "Multi Scope", nstatus=1) + app = stdgui2.stdapp(my_graph, "Multi Scope", nstatus=1) app.MainLoop() if __name__ == '__main__': |