Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-examples / python / audio / audio_fft.py

diff --git a/gnuradio-examples/python/audio/audio_fft.py b/gnuradio-examples/python/audio/audio_fft.py
index 7c54dd55b5eee0275fb9798933f191eec0246c1e..960e0f94d5ef776f96068af653d71dad4e892611 100755 (executable)
--- a/gnuradio-examples/python/audio/audio_fft.py
+++ b/gnuradio-examples/python/audio/audio_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,14 +23,14 @@
 from gnuradio import gr, gru, audio
 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, fftsink2, waterfallsink2, scopesink2, form, slider
 from optparse import OptionParser
 import wx
 import sys
 
-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
@@ -57,11 +57,12 @@ class app_flow_graph(stdgui.gui_flow_graph):
         # build the graph
         if options.waterfall:
             self.scope = \
-              waterfallsink.waterfall_sink_f (self, panel, fft_size=1024, sample_rate=sample_rate)
+              waterfallsink2.waterfall_sink_f (panel, fft_size=1024, sample_rate=sample_rate)
         elif options.oscilloscope:
-            self.scope = scopesink.scope_sink_f(self, panel, sample_rate=sample_rate)
+            self.scope = scopesink2.scope_sink_f(panel, sample_rate=sample_rate)
         else:
-            self.scope = fftsink.fft_sink_f (self, panel, fft_size=1024, sample_rate=sample_rate, fft_rate=30)
+            self.scope = fftsink2.fft_sink_f (panel, fft_size=1024, sample_rate=sample_rate, fft_rate=30,
+                                             ref_scale=1.0, ref_level=0, y_divs=12)
 
        self.src = audio.source (sample_rate, options.audio_input)
 
@@ -130,7 +131,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
 
         
 def main ():
-    app = stdgui.stdapp(app_flow_graph, "Audio FFT", nstatus=1)
+    app = stdgui2.stdapp(app_top_block, "Audio FFT", nstatus=1)
     app.MainLoop()
 
 if __name__ == '__main__':