Examples: Fixed minor bugs in examples and blks2impl from namespace changes.

Author: benreynwar

gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py

@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter
 import math
 
 
@@ -68,7 +68,7 @@ def __init__(self, fs, tau=75e-6):
             global plot1
             plot1 = gru.gnuplot_freqz (gru.freqz (btaps, ataps), fs, True)
 
-        deemph = gr.iir_filter_ffd(btaps, ataps)
+        deemph = filter.iir_filter_ffd(btaps, ataps)
 	self.connect(self, deemph, self)
 
 #
@@ -147,5 +147,5 @@ def __init__(self, fs, tau=75e-6):
             global plot2
             plot2 = gru.gnuplot_freqz (gru.freqz (btaps, ataps), fs, True)
 
-        preemph = gr.iir_filter_ffd(btaps, ataps)
+        preemph = filter.iir_filter_ffd(btaps, ataps)
 	self.connect(self, preemph, self)

gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py

@@ -20,7 +20,7 @@
 #
 
 import math
-from gnuradio import gr, optfir
+from gnuradio import gr, optfir, filter
 from gnuradio.blks2impl.fm_emph import fm_preemph
 
 #from gnuradio import ctcss
@@ -66,7 +66,7 @@ def __init__(self, audio_rate, quad_rate, tau=75e-6, max_dev=5e3):
                                            40)              # stopband atten dB
 
             #print "len(interp_taps) =", len(interp_taps)
-            self.interpolator = gr.interp_fir_filter_fff (interp_factor, interp_taps)
+            self.interpolator = filter.interp_fir_filter_fff (interp_factor, interp_taps)
 
         self.preemph = fm_preemph (quad_rate, tau=tau)
 

gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py

@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gru
+from gnuradio import gr, gru, filter
 
 _plot = None
 
@@ -105,7 +105,7 @@ def __init__(self, interpolation, decimation, taps=None, fractional_bw=None):
         Rational resampling polyphase FIR filter with
         float input, float output and float taps.
         """
-        _rational_resampler_base.__init__(self, gr.rational_resampler_base_fff,
+        _rational_resampler_base.__init__(self, filter.rational_resampler_base_fff,
 				          interpolation, decimation, taps, fractional_bw)
 
 class rational_resampler_ccf(_rational_resampler_base):
@@ -114,7 +114,7 @@ def __init__(self, interpolation, decimation, taps=None, fractional_bw=None):
         Rational resampling polyphase FIR filter with
         complex input, complex output and float taps.
         """
-        _rational_resampler_base.__init__(self, gr.rational_resampler_base_ccf,
+        _rational_resampler_base.__init__(self, filter.rational_resampler_base_ccf,
                                           interpolation, decimation, taps, fractional_bw)
 
 class rational_resampler_ccc(_rational_resampler_base):
@@ -123,5 +123,5 @@ def __init__(self, interpolation, decimation, taps=None, fractional_bw=None):
         Rational resampling polyphase FIR filter with
         complex input, complex output and complex taps.
         """
-        _rational_resampler_base.__init__(self, gr.rational_resampler_base_ccc,
+        _rational_resampler_base.__init__(self, filter.rational_resampler_base_ccc,
                                           interpolation, decimation, taps, fractional_bw)

gr-filter/examples/fmtest.py

@@ -20,8 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, blks2
-from gnuradio import filter
+from gnuradio import gr, blks2, filter
 import sys, math, time
 
 try:
@@ -84,7 +83,7 @@ def __init__(self):
 
         self.head = gr.head(gr.sizeof_gr_complex, self._nsamples)
         self.snk_tx = gr.vector_sink_c()
-        self.channel = blks2.channel_model(0.1)
+        self.channel = filter.channel_model(0.1)
 
         self.connect(self.sum, self.head, self.channel, self.snk_tx)
 

gr-filter/examples/reconstruction.py

@@ -64,7 +64,7 @@ def main():
 
     src = gr.vector_source_b(data.astype(scipy.uint8).tolist(), False)
     mod = digital.bpsk_mod(samples_per_symbol=2)
-    chan = gr.channel_model(npwr)
+    chan = filter.channel_model(npwr)
     rrc = filter.fft_filter_ccc(1, rrc_taps)
 
     # Split it up into pieces

gr-qtgui/examples/pyqt_const_c.py

@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter
 import sys
 
 try:
@@ -142,7 +142,7 @@ def __init__(self):
         src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.5, 0)
         src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.5, 0)
         src  = gr.add_cc()
-        channel = gr.channel_model(0.001)
+        channel = filter.channel_model(0.001)
         thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
         self.snk1 = qtgui.const_sink_c(npts, "Constellation Example", 1)
 

gr-qtgui/examples/pyqt_example_c.py

@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter
 import sys
 
 try:
@@ -142,7 +142,7 @@ def __init__(self):
         src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0)
         src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0)
         src  = gr.add_cc()
-        channel = gr.channel_model(0.001)
+        channel = filter.channel_model(0.001)
         thr = gr.throttle(gr.sizeof_gr_complex, 100*fftsize)
         self.snk1 = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
                                  0, Rs,

gr-qtgui/examples/pyqt_freq_c.py

@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter
 import sys
 
 try:
@@ -142,7 +142,7 @@ def __init__(self):
         src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0)
         src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0)
         src  = gr.add_cc()
-        channel = gr.channel_model(0.01)
+        channel = filter.channel_model(0.01)
         thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
         self.snk1 = qtgui.freq_sink_c(npts, gr.firdes.WIN_BLACKMAN_hARRIS,
                                       0, Rs,

gr-qtgui/examples/pyqt_time_c.py

@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter
 import sys
 
 try:
@@ -142,7 +142,7 @@ def __init__(self):
         src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0)
         src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0)
         src  = gr.add_cc()
-        channel = gr.channel_model(0.01)
+        channel = filter.channel_model(0.01)
         thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
         self.snk1 = qtgui.time_sink_c(npts, Rs,
                                       "Complex Time Example", 1)

gr-qtgui/examples/pyqt_waterfall_c.py

@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter
 import sys
 
 try:
@@ -142,7 +142,7 @@ def __init__(self):
         src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0)
         src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0)
         src  = gr.add_cc()
-        channel = gr.channel_model(0.01)
+        channel = filter.channel_model(0.01)
         thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
         self.snk1 = qtgui.waterfall_sink_c(npts, gr.firdes.WIN_BLACKMAN_hARRIS,
                                            0, Rs,