Merge r6461:6464 from jcorgan/t162-staging into trunk.

[debian/gnuradio] / gr-utils / src / python / usrp_oscope.py

diff --git a/gr-utils/src/python/usrp_oscope.py b/gr-utils/src/python/usrp_oscope.py
index 5d714928163badefc7fe39b62bfaf16246ccfc6b..7c202136eb8fbc856ba6a159240b6a5f091f8422 100755 (executable)
--- a/gr-utils/src/python/usrp_oscope.py
+++ b/gr-utils/src/python/usrp_oscope.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -26,7 +26,7 @@ from gnuradio import gr, gru
 from gnuradio import usrp
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
+from gnuradio.wxgui import stdgui2, scopesink2, form, slider
 from optparse import OptionParser
 import wx
 import sys
@@ -46,9 +46,9 @@ def pick_subdevice(u):
     return (0, 0)
 
 
-class app_flow_graph(stdgui.gui_flow_graph):
+class app_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
@@ -97,7 +97,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
 
         input_rate = self.u.adc_freq() / self.u.decim_rate()
 
-        self.scope = scopesink.scope_sink_c(self, panel, sample_rate=input_rate,
+        self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate,
                                             frame_decim=options.frame_decim,
                                             v_scale=options.v_scale,
                                             t_scale=options.t_scale)
@@ -245,7 +245,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
         return ok
 
 def main ():
-    app = stdgui.stdapp(app_flow_graph, "USRP O'scope", nstatus=1)
+    app = stdgui2.stdapp(app_top_block, "USRP O'scope", nstatus=1)
     app.MainLoop()
 
 if __name__ == '__main__':