diff options
author | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 14:28:22 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 14:40:43 -0500 |
commit | fd110bdbbe8bc40781c34f33c70deec5b7931109 (patch) | |
tree | ef18e813add19b09c57cc21cb672ea602701405b /gr-filter/examples/decimate.py | |
parent | 0c9c16fb008b02a5af39fb22e18acfff2dbd933a (diff) |
analog: Removing reference to gr.sig_source_X and gr.noise_source_X where possible.
Passing make and make test. Examples and apps need testing.
gr-filter relies on sig_source and noise_source, so can't remove them from core.
Diffstat (limited to 'gr-filter/examples/decimate.py')
-rwxr-xr-x | gr-filter/examples/decimate.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gr-filter/examples/decimate.py b/gr-filter/examples/decimate.py index 7f1f03d8f2..4a7a5eb155 100755 --- a/gr-filter/examples/decimate.py +++ b/gr-filter/examples/decimate.py @@ -25,17 +25,23 @@ from gnuradio import filter import sys, time try: + from gnuradio import analog +except ImportError: + sys.stderr.write("Error: Program requires gr-analog.\n") + sys.exit(1) + +try: import scipy from scipy import fftpack except ImportError: - print "Error: Program requires scipy (see: www.scipy.org)." + sys.stderr.write("Error: Program requires scipy (see: www.scipy.org).\n") sys.exit(1) try: import pylab from pylab import mlab except ImportError: - print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)." + sys.stderr.write("Error: Program requires matplotlib (see: matplotlib.sourceforge.net).\n") sys.exit(1) class pfb_top_block(gr.top_block): @@ -65,7 +71,7 @@ class pfb_top_block(gr.top_block): self.add = gr.add_cc() freqs = [10, 20, 2040] for i in xrange(len(freqs)): - self.signals.append(gr.sig_source_c(self._fs, gr.GR_SIN_WAVE, freqs[i], 1)) + self.signals.append(analog.sig_source_c(self._fs, analog.GR_SIN_WAVE, freqs[i], 1)) self.connect(self.signals[i], (self.add,i)) self.head = gr.head(gr.sizeof_gr_complex, self._N) |