[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7045 - in gnuradio/trunk: gr-comedi/src gr-gsm-fr-voc
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r7045 - in gnuradio/trunk: gr-comedi/src gr-gsm-fr-vocoder/src/python gr-pager/src gr-radio-astronomy/src/python gr-sounder/src/python gr-usrp/src gr-video-sdl/src |
|
Date: |
Tue, 27 Nov 2007 13:06:10 -0700 (MST) |
Author: jcorgan
Date: 2007-11-27 13:06:08 -0700 (Tue, 27 Nov 2007)
New Revision: 7045
Modified:
gnuradio/trunk/gr-comedi/src/qa_comedi.py
gnuradio/trunk/gr-gsm-fr-vocoder/src/python/encdec.py
gnuradio/trunk/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
gnuradio/trunk/gr-pager/src/qa_pager.py
gnuradio/trunk/gr-radio-astronomy/src/python/qa_ra.py
gnuradio/trunk/gr-radio-astronomy/src/python/ra_fftsink.py
gnuradio/trunk/gr-radio-astronomy/src/python/ra_stripchartsink.py
gnuradio/trunk/gr-radio-astronomy/src/python/ra_waterfallsink.py
gnuradio/trunk/gr-radio-astronomy/src/python/usrp_psr_receiver.py
gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
gnuradio/trunk/gr-sounder/src/python/sounder.py
gnuradio/trunk/gr-usrp/src/qa_usrp.py
gnuradio/trunk/gr-video-sdl/src/qa_video_sdl.py
Log:
Implements ticket:208
Modified: gnuradio/trunk/gr-comedi/src/qa_comedi.py
===================================================================
--- gnuradio/trunk/gr-comedi/src/qa_comedi.py 2007-11-27 19:38:39 UTC (rev
7044)
+++ gnuradio/trunk/gr-comedi/src/qa_comedi.py 2007-11-27 20:06:08 UTC (rev
7045)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -26,10 +26,10 @@
class qa_comedi (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def test_000_nop (self):
"""Just see if we can import the module...
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/python/encdec.py
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/python/encdec.py 2007-11-27
19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/python/encdec.py 2007-11-27
20:06:08 UTC (rev 7045)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,7 +25,7 @@
from gnuradio.vocoder import gsm_full_rate
def build_graph():
- fg = gr.flow_graph()
+ tb = gr.top_block()
src = audio.source(8000)
src_scale = gr.multiply_const_ff(32767)
f2s = gr.float_to_short ()
@@ -34,11 +34,11 @@
s2f = gr.short_to_float ()
sink_scale = gr.multiply_const_ff(1.0/32767.)
sink = audio.sink(8000)
- fg.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
- return fg
+ tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+ return tb
if __name__ == '__main__':
- fg = build_graph()
- fg.start()
+ tb = build_graph()
+ tb.start()
raw_input ('Press Enter to exit: ')
- fg.stop()
+ tb.stop()
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
2007-11-27 19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
2007-11-27 20:06:08 UTC (rev 7045)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -26,10 +26,10 @@
class qa_howto (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
if __name__ == '__main__':
gr_unittest.main ()
Modified: gnuradio/trunk/gr-pager/src/qa_pager.py
===================================================================
--- gnuradio/trunk/gr-pager/src/qa_pager.py 2007-11-27 19:38:39 UTC (rev
7044)
+++ gnuradio/trunk/gr-pager/src/qa_pager.py 2007-11-27 20:06:08 UTC (rev
7045)
@@ -26,10 +26,10 @@
class qa_pgr(gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
if __name__ == '__main__':
gr_unittest.main ()
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/qa_ra.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/qa_ra.py 2007-11-27
19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/qa_ra.py 2007-11-27
20:06:08 UTC (rev 7045)
@@ -26,10 +26,10 @@
class qa_ra (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def test_000_(self): # ensure that we can load the module
pass
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/ra_fftsink.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/ra_fftsink.py 2007-11-27
19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/ra_fftsink.py 2007-11-27
20:06:08 UTC (rev 7045)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2003,2004,2005 Free Software Foundation, Inc.
+# Copyright 2003,2004,2005,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,7 +21,7 @@
#
from gnuradio import gr, gru, window
-from gnuradio.wxgui import stdgui
+from gnuradio.wxgui import stdgui2
import wx
import gnuradio.wxgui.plot as plot
import numpy
@@ -94,12 +94,16 @@
self.baseband_freq = baseband_freq
-class ra_fft_sink_f(gr.hier_block, ra_fft_sink_base):
- def __init__(self, fg, parent, baseband_freq=0,
- y_per_div=10, sc_y_per_div=0.5, sc_ref_level=40,
ref_level=50, sample_rate=1, fft_size=512,
+class ra_fft_sink_f(gr.hier_block2, ra_fft_sink_base):
+ def __init__(self, parent, baseband_freq=0,
+ y_per_div=10, sc_y_per_div=0.5, sc_ref_level=40,
ref_level=50, sample_rate=1, fft_size=512,
fft_rate=15, average=False, avg_alpha=None, title='',
size=default_ra_fftsink_size, peak_hold=False, ofunc=None,
xydfunc=None):
+ gr.hier_block2.__init__(self, "ra_fft_sink_f",
+ gr.io_signature(1, 1, gr.sizeof_float),
+ gr.io_signature(0, 0, 0))
+
ra_fft_sink_base.__init__(self, input_is_real=True,
baseband_freq=baseband_freq,
y_per_div=y_per_div, sc_y_per_div=sc_y_per_div,
sc_ref_level=sc_ref_level, ref_level=ref_level,
@@ -120,19 +124,23 @@
log = gr.nlog10_ff(20, fft_size, -20*math.log10(fft_size))
sink = gr.message_sink(gr.sizeof_float * fft_size, self.msgq, True)
- fg.connect (s2p, one_in_n, fft, c2mag, self.avg, log, sink)
- gr.hier_block.__init__(self, fg, s2p, sink)
+ self.connect (self, s2p, one_in_n, fft, c2mag, self.avg, log, sink)
self.win = fft_window(self, parent, size=size)
self.set_average(self.average)
-class ra_fft_sink_c(gr.hier_block, ra_fft_sink_base):
- def __init__(self, fg, parent, baseband_freq=0,
+class ra_fft_sink_c(gr.hier_block2, ra_fft_sink_base):
+ def __init__(self, parent, baseband_freq=0,
y_per_div=10, sc_y_per_div=0.5, sc_ref_level=40,
ref_level=50, sample_rate=1, fft_size=512,
fft_rate=15, average=False, avg_alpha=None, title='',
size=default_ra_fftsink_size, peak_hold=False, ofunc=None,
xydfunc=None):
+ gr.hier_block2.__init__(self, "ra_fft_sink_c",
+ gr.io_signature(1, 1, gr.sizeof_gr_complex),
+ gr.io_signature(0, 0, 0))
+
+
ra_fft_sink_base.__init__(self, input_is_real=False,
baseband_freq=baseband_freq,
y_per_div=y_per_div, sc_y_per_div=sc_y_per_div,
sc_ref_level=sc_ref_level, ref_level=ref_level,
@@ -153,8 +161,7 @@
log = gr.nlog10_ff(20, fft_size, -20*math.log10(fft_size))
sink = gr.message_sink(gr.sizeof_float * fft_size, self.msgq, True)
- fg.connect(s2p, one_in_n, fft, c2mag, self.avg, log, sink)
- gr.hier_block.__init__(self, fg, s2p, sink)
+ self.connect(self, s2p, one_in_n, fft, c2mag, self.avg, log, sink)
self.win = fft_window(self, parent, size=size)
self.set_average(self.average)
@@ -444,36 +451,12 @@
# ----------------------------------------------------------------
-# Deprecated interfaces
-# ----------------------------------------------------------------
-
-# returns (block, win).
-# block requires a single input stream of float
-# win is a subclass of wxWindow
-
-def make_ra_fft_sink_f(fg, parent, title, fft_size, input_rate, ymin = 0,
ymax=50):
-
- block = ra_fft_sink_f(fg, parent, title=title, fft_size=fft_size,
sample_rate=input_rate,
- y_per_div=(ymax - ymin)/8, ref_level=ymax)
- return (block, block.win)
-
-# returns (block, win).
-# block requires a single input stream of gr_complex
-# win is a subclass of wxWindow
-
-def make_ra_fft_sink_c(fg, parent, title, fft_size, input_rate, ymin=0,
ymax=50):
- block = ra_fft_sink_c(fg, parent, title=title, fft_size=fft_size,
sample_rate=input_rate,
- y_per_div=(ymax - ymin)/8, ref_level=ymax)
- return (block, block.win)
-
-
-# ----------------------------------------------------------------
# Standalone test app
# ----------------------------------------------------------------
-class test_app_flow_graph (stdgui.gui_flow_graph):
+class test_app_flow_graph (stdgui2.std_top_block):
def __init__(self, frame, panel, vbox, argv):
- stdgui.gui_flow_graph.__init__ (self, frame, panel, vbox, argv)
+ stdgui2.std_top_block.__init__ (self, frame, panel, vbox, argv)
fft_size = 256
@@ -488,7 +471,7 @@
# suck down all the CPU available. Normally you wouldn't use these.
thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
- sink1 = ra_fft_sink_c (self, panel, title="Complex Data",
fft_size=fft_size,
+ sink1 = ra_fft_sink_c (panel, title="Complex Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3,
ref_level=60, y_per_div=10)
vbox.Add (sink1.win, 1, wx.EXPAND)
@@ -497,14 +480,14 @@
src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 5.75e3, 1000)
#src2 = gr.sig_source_f (input_rate, gr.GR_CONST_WAVE, 5.75e3, 1000)
thr2 = gr.throttle(gr.sizeof_float, input_rate)
- sink2 = ra_fft_sink_f (self, panel, title="Real Data",
fft_size=fft_size*2,
+ sink2 = ra_fft_sink_f (panel, title="Real Data", fft_size=fft_size*2,
sample_rate=input_rate, baseband_freq=100e3,
ref_level=60, y_per_div=10)
vbox.Add (sink2.win, 1, wx.EXPAND)
self.connect (src2, thr2, sink2)
def main ():
- app = stdgui.stdapp (test_app_flow_graph,
+ app = stdgui2.stdapp (test_app_flow_graph,
"FFT Sink Test App")
app.MainLoop ()
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/ra_stripchartsink.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/ra_stripchartsink.py
2007-11-27 19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/ra_stripchartsink.py
2007-11-27 20:06:08 UTC (rev 7045)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2003,2004,2005 Free Software Foundation, Inc.
+# Copyright 2003,2004,2005,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,7 +21,7 @@
#
from gnuradio import gr, gru
-from gnuradio.wxgui import stdgui
+from gnuradio.wxgui import stdgui2
import wx
import gnuradio.wxgui.plot as plot
import Numeric
@@ -67,14 +67,18 @@
def set_autoscale(self, auto):
self.autoscale = auto
-class stripchart_sink_f(gr.hier_block, stripchart_sink_base):
- def __init__(self, fg, parent,
+class stripchart_sink_f(gr.hier_block2, stripchart_sink_base):
+ def __init__(self, parent,
y_per_div=10, ref_level=50, sample_rate=1,
title='', stripsize=4,
size=default_stripchartsink_size,xlabel="X",
ylabel="Y", divbase=0.025,
parallel=False, scaling=1.0, autoscale=False):
+ gr.hier_block2.__init__(self, "stripchart_sink_f",
+ gr.io_signature(1, 1, gr.sizeof_float),
+ gr.io_signature(0, 0, 0))
+
stripchart_sink_base.__init__(self, input_is_real=True,
y_per_div=y_per_div, ref_level=ref_level,
sample_rate=sample_rate,
@@ -90,10 +94,8 @@
else:
one = gr.keep_one_in_n (gr.sizeof_float, 1)
sink = gr.message_sink(gr.sizeof_float, self.msgq, True)
- fg.connect (one, sink)
+ self.connect (self, one, sink)
- gr.hier_block.__init__(self, fg, one, sink)
-
self.win = stripchart_window(self, parent, size=size)
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/ra_waterfallsink.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/ra_waterfallsink.py
2007-11-27 19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/ra_waterfallsink.py
2007-11-27 20:06:08 UTC (rev 7045)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2003,2004,2005 Free Software Foundation, Inc.
+# Copyright 2003,2004,2005,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,7 +21,7 @@
#
from gnuradio import gr, gru, window
-from gnuradio.wxgui import stdgui
+from gnuradio.wxgui import stdgui2
import wx
import gnuradio.wxgui.plot as plot
import numpy
@@ -86,9 +86,6 @@
self.input_is_real = input_is_real
self.msgq = gr.msg_queue(2) # queue up to 2 messages
- def reconnect( self, fg ):
- fg.connect( *self.block_list )
-
def set_average(self, average):
self.average = average
if average:
@@ -109,12 +106,16 @@
def _set_n(self):
self.one_in_n.set_n(max(1,
int(self.sample_rate/self.fft_size/self.fft_rate)))
-class waterfall_sink_f(gr.hier_block, waterfall_sink_base):
- def __init__(self, fg, parent, baseband_freq=0,
+class waterfall_sink_f(gr.hier_block2, waterfall_sink_base):
+ def __init__(self, parent, baseband_freq=0,
ref_level=0, sample_rate=1, fft_size=512,
fft_rate=default_fft_rate, average=False, avg_alpha=None,
title='', size=default_fftsink_size, report=None, span=40,
ofunc=None, xydfunc=None):
+ gr.hier_block2.__init__(self, "waterfall_sink_f",
+ gr.io_signature(1, 1, gr.sizeof_float),
+ gr.io_signature(0, 0, 0))
+
waterfall_sink_base.__init__(self, input_is_real=True,
baseband_freq=baseband_freq,
sample_rate=sample_rate,
@@ -132,21 +133,22 @@
log = gr.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size))
sink = gr.message_sink(gr.sizeof_float * self.fft_size, self.msgq,
True)
- self.block_list = (s2p, self.one_in_n, fft, c2mag, self.avg, log, sink)
- self.reconnect( fg )
- gr.hier_block.__init__(self, fg, s2p, sink)
-
+ self.connect(self, s2p, self.one_in_n, fft, c2mag, self.avg, log, sink)
self.win = waterfall_window(self, parent, size=size, report=report,
ref_level=ref_level, span=span,
ofunc=ofunc, xydfunc=xydfunc)
self.set_average(self.average)
-class waterfall_sink_c(gr.hier_block, waterfall_sink_base):
- def __init__(self, fg, parent, baseband_freq=0,
+class waterfall_sink_c(gr.hier_block2, waterfall_sink_base):
+ def __init__(self, parent, baseband_freq=0,
ref_level=0, sample_rate=1, fft_size=512,
fft_rate=default_fft_rate, average=False, avg_alpha=None,
title='', size=default_fftsink_size, report=None, span=40,
ofunc=None, xydfunc=None):
+ gr.hier_block2.__init__(self, "waterfall_sink_c",
+ gr.io_signature(1, 1, gr.sizeof_gr_complex),
+ gr.io_signature(0, 0, 0))
+
waterfall_sink_base.__init__(self, input_is_real=False,
baseband_freq=baseband_freq,
sample_rate=sample_rate,
@@ -166,10 +168,7 @@
log = gr.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size))
sink = gr.message_sink(gr.sizeof_float * self.fft_size, self.msgq,
True)
- self.block_list = (s2p, self.one_in_n, fft, c2mag, self.avg, log, sink)
- self.reconnect( fg )
- gr.hier_block.__init__(self, fg, s2p, sink)
-
+ self.connect(self, s2p, self.one_in_n, fft, c2mag, self.avg, log, sink)
self.win = waterfall_window(self, parent, size=size, report=report,
ref_level=ref_level, span=span,
ofunc=ofunc, xydfunc=xydfunc)
self.set_average(self.average)
@@ -602,36 +601,12 @@
# ----------------------------------------------------------------
-# Deprecated interfaces
-# ----------------------------------------------------------------
-
-# returns (block, win).
-# block requires a single input stream of float
-# win is a subclass of wxWindow
-
-def make_waterfall_sink_f(fg, parent, title, fft_size, input_rate):
-
- block = waterfall_sink_f(fg, parent, title=title, fft_size=fft_size,
- sample_rate=input_rate)
- return (block, block.win)
-
-# returns (block, win).
-# block requires a single input stream of gr_complex
-# win is a subclass of wxWindow
-
-def make_waterfall_sink_c(fg, parent, title, fft_size, input_rate):
- block = waterfall_sink_c(fg, parent, title=title, fft_size=fft_size,
- sample_rate=input_rate)
- return (block, block.win)
-
-
-# ----------------------------------------------------------------
# Standalone test app
# ----------------------------------------------------------------
-class test_app_flow_graph (stdgui.gui_flow_graph):
+class test_app_flow_graph (stdgui2.std_top_block):
def __init__(self, frame, panel, vbox, argv):
- stdgui.gui_flow_graph.__init__ (self, frame, panel, vbox, argv)
+ stdgui2.std_top_block.__init__ (self, frame, panel, vbox, argv)
fft_size = 512
@@ -646,7 +621,7 @@
# suck down all the CPU available. Normally you wouldn't use these.
thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
- sink1 = waterfall_sink_c (self, panel, title="Complex Data",
+ sink1 = waterfall_sink_c (panel, title="Complex Data",
fft_size=fft_size,
sample_rate=input_rate, baseband_freq=0,
size=(600,144) )
@@ -657,13 +632,13 @@
src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 5.75e3, 1000)
#src2 = gr.sig_source_f (input_rate, gr.GR_CONST_WAVE, 5.75e3, 1000)
thr2 = gr.throttle(gr.sizeof_float, input_rate)
- sink2 = waterfall_sink_f (self, panel, title="Real Data",
fft_size=fft_size,
+ sink2 = waterfall_sink_f (panel, title="Real Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=0)
vbox.Add (sink2.win, 1, wx.EXPAND)
self.connect (src2, thr2, sink2)
def main ():
- app = stdgui.stdapp (test_app_flow_graph,
+ app = stdgui2.stdapp (test_app_flow_graph,
"Waterfall Sink Test App")
app.MainLoop ()
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/usrp_psr_receiver.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/usrp_psr_receiver.py
2007-11-27 19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/usrp_psr_receiver.py
2007-11-27 20:06:08 UTC (rev 7045)
@@ -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
#
@@ -29,7 +29,7 @@
# and epoch folding analysis
#
#
-from gnuradio import gr, gru, blks, audio
+from gnuradio import gr, gru, blks2, audio
from usrpm import usrp_dbid
from gnuradio import usrp, optfir
from gnuradio import eng_notation
@@ -46,9 +46,9 @@
import math
-class app_flow_graph(stdgui.gui_flow_graph):
+class app_flow_graph(stdgui2.std_top_block):
def __init__(self, frame, panel, vbox, argv):
- stdgui.gui_flow_graph.__init__(self)
+ stdgui2.std_top_block.__init__(self)
self.frame = frame
self.panel = panel
@@ -292,7 +292,7 @@
#
# Create the appropriate FFT scope
#
- self.scope = ra_fftsink.ra_fft_sink_f (self, panel,
+ self.scope = ra_fftsink.ra_fft_sink_f (panel,
fft_size=int(options.fft_size), sample_rate=PULSAR_MAX_FREQ*2,
title="Post-detector spectrum",
ofunc=self.pulsarfunc, xydfunc=self.xydfunc, fft_rate=200)
@@ -366,7 +366,7 @@
self.folder_comb = gr.fft_filter_ccc(1,bogtaps)
# Rational resampler
- self.folder_rr = blks.rational_resampler_fff(self, self.interp,
self.decim)
+ self.folder_rr = blks2.rational_resampler_fff(self.interp, self.decim)
# Epoch folder bandpass
bogtaps = Numeric.zeros(1, Numeric.Float64)
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
2007-11-27 19:38:39 UTC (rev 7044)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
2007-11-27 20:06:08 UTC (rev 7045)
@@ -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
#
@@ -25,7 +25,7 @@
from usrpm import usrp_dbid
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui, ra_fftsink, ra_stripchartsink,
ra_waterfallsink, form, slider, waterfallsink
+from gnuradio.wxgui import stdgui2, ra_fftsink, ra_stripchartsink,
ra_waterfallsink, form, slider, waterfallsink
from optparse import OptionParser
import wx
import sys
@@ -40,9 +40,9 @@
exec(str)
return(x)
-class app_flow_graph(stdgui.gui_flow_graph):
+class app_flow_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
@@ -1082,7 +1082,7 @@
self.notch_taps = FFT.inverse_fft(tmptaps)
def main ():
- app = stdgui.stdapp(app_flow_graph, "RADIO ASTRONOMY SPECTRAL/CONTINUUM
RECEIVER: $Revision$", nstatus=1)
+ app = stdgui2.stdapp(app_flow_graph, "RADIO ASTRONOMY SPECTRAL/CONTINUUM
RECEIVER: $Revision$", nstatus=1)
app.MainLoop()
if __name__ == '__main__':
Modified: gnuradio/trunk/gr-sounder/src/python/sounder.py
===================================================================
--- gnuradio/trunk/gr-sounder/src/python/sounder.py 2007-11-27 19:38:39 UTC
(rev 7044)
+++ gnuradio/trunk/gr-sounder/src/python/sounder.py 2007-11-27 20:06:08 UTC
(rev 7045)
@@ -90,7 +90,7 @@
self._verbose = verbose
self._debug = debug
- self._fg = gr.flow_graph()
+ self._tb = gr.top_block()
self._u = usrp.source_c(fpga_filename='usrp_sounder.rbf')
if not self._loopback:
if self._subdev_spec == None:
@@ -110,7 +110,7 @@
print "Using smoothing alpha of", self._alpha
self._lpf = gr.single_pole_iir_filter_cc(self._alpha, self._length)
self._sink = gr.message_sink(self._vblen, self._msgq, True)
- self._fg.connect(self._u, self._s2v, self._lpf, self._sink)
+ self._tb.connect(self._u, self._s2v, self._lpf, self._sink)
def tune(self, frequency):
if self._verbose:
@@ -135,17 +135,17 @@
def start(self):
if self._debug:
print "Starting receiver flow graph."
- self._fg.start()
+ self._tb.start()
def wait(self):
if self._debug:
print "Waiting for threads..."
- self._fg.wait()
+ self._tb.wait()
def stop(self):
if self._debug:
print "Stopping receiver flow graph."
- self._fg.stop()
+ self._tb.stop()
self.wait()
if self._debug:
print "Receiver flow graph stopped."
Modified: gnuradio/trunk/gr-usrp/src/qa_usrp.py
===================================================================
--- gnuradio/trunk/gr-usrp/src/qa_usrp.py 2007-11-27 19:38:39 UTC (rev
7044)
+++ gnuradio/trunk/gr-usrp/src/qa_usrp.py 2007-11-27 20:06:08 UTC (rev
7045)
@@ -26,10 +26,10 @@
class qa_usrp (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def test_000_nop (self):
"""Just see if we can import the module...
Modified: gnuradio/trunk/gr-video-sdl/src/qa_video_sdl.py
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/qa_video_sdl.py 2007-11-27 19:38:39 UTC
(rev 7044)
+++ gnuradio/trunk/gr-video-sdl/src/qa_video_sdl.py 2007-11-27 20:06:08 UTC
(rev 7045)
@@ -26,10 +26,10 @@
class qa_video_sdl (gr_unittest.TestCase):
def setUp (self):
- self.fg = gr.flow_graph ()
+ self.tb = gr.top_block ()
def tearDown (self):
- self.fg = None
+ self.tb = None
def test_000_nop (self):
"""Just see if we can import the module...
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7045 - in gnuradio/trunk: gr-comedi/src gr-gsm-fr-vocoder/src/python gr-pager/src gr-radio-astronomy/src/python gr-sounder/src/python gr-usrp/src gr-video-sdl/src,
jcorgan <=